From 366f399efad570147c6b73b3492ed1999d0c9fe1 Mon Sep 17 00:00:00 2001
From: Julien Fischer <jfischer@opturion.com>
Date: Fri, 4 Jan 2013 16:21:34 +1100
Subject: [PATCH] Update and simplify the "tar" target in the top-level
 Mmakefile.

The main change here is to package up the test suite with the source
distribution rather than as a separate tarball.  The resulting combined tarball
is not significantly larger, so there is no good reason for not just
including the tests now.  TThe same rationale applies to not excluding
the benchmarks from the source distribution.

Mmakefile:
	Delete stuff in the tar target that was used for handling unused
	directories in the old CVS repository.

	Include the test suite in the main source distribution tarball
	rather than building a separate one for it.
---
 Mmakefile | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/Mmakefile b/Mmakefile
index bdf24bbb3..60cfd0439 100644
--- a/Mmakefile
+++ b/Mmakefile
@@ -468,8 +468,6 @@ tar: 	$(GENERATED_DOCS)
 	# mercury-compiler-$(VERSION).
 	# Put the extras directory into a gzipped tar archive that
 	# will unpack into mercury-extras-$(VERSION).
-	# Put the tests directory into a gzipped tar archive that
-	# will unpack into mercury-tests-$(VERSION).
 	DIRNAME="`pwd`";						\
 	ROOTNAME="`basename $$DIRNAME`";				\
 	export ROOTNAME;						\
@@ -477,41 +475,15 @@ tar: 	$(GENERATED_DOCS)
 		mkdir 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);	\
-		mv tests		mercury-tests-$(VERSION);	\
 		tar -cf - mercury-compiler-$(VERSION) |			\
 			gzip -9 > mercury-compiler-$(VERSION).tar.gz;	\
 		tar -cf - mercury-extras-$(VERSION) |			\
 			gzip -9 > mercury-extras-$(VERSION).tar.gz;	\
-		tar -cf - mercury-tests-$(VERSION) |			\
-			gzip -9 > mercury-tests-$(VERSION).tar.gz;	\
 		mv mercury-compiler-$(VERSION)	$$ROOTNAME;		\
 		mv mercury-extras-$(VERSION)	$$ROOTNAME/extras;	\
-		mv mercury-tests-$(VERSION)	tests;			\
-		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;					\