[m-rev.] diff: make building the srcdist less likely to fail

[Julien Fischer]

Branches: main, 11.01

Make the top-level tar (used to build the source distribution) target more
robust.

Mmakefile:
 	Make the tar target work regardless of whether CVS {checkou,update} is
 	set to prune empty directories or not.  (Previously, the tar target
 	assumed that that empty directories were *not* pruned.)
 	NOTE: I am aware that a couple of lines are > 80 chars in length
 	but in this case that I think adding more line breaks just makes
 	things more confusing.

 	Exclude the now-unused concurrency directory from the extras
 	distribution tarball.

extras/concurrency/.nocopyright:
 	Delete this file - its presence prevents CVS from treating this
 	directory as empty.

Julien.

Index: Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/Mmakefile,v
retrieving revision 1.142
diff -u -r1.142 Mmakefile
--- Mmakefile	17 Dec 2010 00:28:08 -0000	1.142
+++ Mmakefile	21 Dec 2010 06:53:01 -0000
@@ -470,13 +470,22 @@
  	export ROOTNAME;						\
  	cd .. && (							\
  		mkdir stuff-to-exclude;					\
-		mv $$ROOTNAME/trial	stuff-to-exclude;		\
-		mv $$ROOTNAME/bytecode	stuff-to-exclude;		\
-		mv $$ROOTNAME/lp_solve	stuff-to-exclude;		\
-		mv $$ROOTNAME/trax	stuff-to-exclude;		\
-		mv $$ROOTNAME/extras/opium_m	stuff-to-exclude;	\
-		mv $$ROOTNAME/extras/aditi stuff-to-exclude;		\
-		mv $$ROOTNAME/extras/stream stuff-to-exclude;		\
+		test -d $$ROOTNAME/bytecode && 				\
+			mv $$ROOTNAME/bytecode stuff-to-exclude; 	\
+		test -d $$ROOTNAME/lp_solver && 			\
+			mv $$ROOTNAME/lp_solvestuff-to-exclude; 	\
+		test -d $$ROOTNAME/trax && 				\
+			mv $$ROOTNAME/trax stuff-to-exclude; 		\
+		test -d $$ROOTNAME/trial && 				\
+			mv $$ROOTNAME/trial stuff-to-exclude; 		\
+		test -d $$ROOTNAME/extras/aditi && 			\
+			mv $$ROOTNAME/extras/aditi stuff-to-exclude;   	\
+		test -d $$ROOTNAME/extras/concurrency && 		\
+			mv $$ROOTNAME/extras/concurrency stuff-to-exclude; \
+		test -d $$ROOTNAME/extras/opium_m && 			\
+			mv $$ROOTNAME/extras/opium_m stuff-to-exclude; 	\
+		test -d $$ROOTNAME/extras/stream && 			\
+			mv $$ROOTNAME/extras/stream stuff-to-exclude;  	\
  		mv $$ROOTNAME/extras/quickcheck stuff-to-exclude;	\
  		mv $$ROOTNAME/extras	mercury-extras-$(VERSION);	\
  		mv $$ROOTNAME		mercury-compiler-$(VERSION);	\
@@ -490,8 +499,14 @@
  		mv mercury-compiler-$(VERSION)	$$ROOTNAME;		\
  		mv mercury-extras-$(VERSION)	$$ROOTNAME/extras;	\
  		mv mercury-tests-$(VERSION)	tests;			\
-		mv stuff-to-exclude/opium_m	$$ROOTNAME/extras/opium_m;\
-		mv stuff-to-exclude/aditi	$$ROOTNAME/extras/aditi;\
+		test -d stuff-to-exclude/aditi && 			\
+			mv stuff-to-exclude/aditi $$ROOTNAME/extras/aditi; \
+		test -d stuff-to-exclude/concurrency && 		\
+			mv stuff-to-exclude/concurrency	$$ROOTNAME/extras/concurrency; \
+		test -d stuff-to-exclude/opium_m && 			\
+			mv stuff-to-exclude/opium_m $$ROOTNAME/extras/opium_m; \
+		test -d stuff-to-exclude/stream && 			\
+			mv stuff-to-exclude/stream $$ROOTNAME/extras/stream;  \
  		mv stuff-to-exclude/quickcheck  $$ROOTNAME/extras/quickcheck; \
  		mv stuff-to-exclude/*		$$ROOTNAME;		\
  		rmdir stuff-to-exclude;					\
Index: VERSION
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/VERSION,v
retrieving revision 1.2
diff -u -r1.2 VERSION
--- VERSION	5 Feb 2010 03:57:12 -0000	1.2
+++ VERSION	21 Dec 2010 06:53:01 -0000
@@ -7,7 +7,7 @@
  #
  # Please assign version numbers according to the scheme explained below.

-VERSION=DEV
+VERSION=DEV-test

  # We use the following general scheme for version numbers:
  #
Index: extras/concurrency/.nocopyright
===================================================================
RCS file: extras/concurrency/.nocopyright
diff -N extras/concurrency/.nocopyright
--- extras/concurrency/.nocopyright	28 Feb 2003 15:20:20 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-README
-philo3.m

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------