[m-rev.] diff: g12 rotds

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main

tools/test_mercury:
	Add support for building a "g12" rotd.  This will be used a specially
	tagged version of the main branch that will be used for the upcoming
	g12 release.  swordfish will be used as the g12 rotd host.

Julien.

Index: test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.277
diff -u -r1.277 test_mercury
--- test_mercury	13 Dec 2005 04:23:39 -0000	1.277
+++ test_mercury	5 Jan 2006 06:20:46 -0000
@@ -75,8 +75,6 @@
 		;;
 esac

-
-
 # directories to use

 TESTDIR=$TOPDIR/test_mercury
@@ -91,6 +89,10 @@
 # for the mercury-compiler, mercury-tests, and mercury-extras distributions.
 ROTD_HOST=jupiter

+# Host to use to build the G12 rlease of the day source distribution
+# for the mercury-compiler, mercury-tests, and mercury-extras distributions.
+G12_ROTD_HOST=swordfish
+
 # Host to use to build the release of the day mercury-gcc source distribution.
 # We don't currently test the gcc backend.
 # GCC_ROTD_HOST=
@@ -167,6 +169,13 @@
 		RELEASE_VERSION=rotd-$DATE
 		RELEASE_VERSION_PATTERN=rotd-*
 		;;
+	g12)
+		CHECKOUT_OPTS=-rg12_rotd
+		BASE_TAG_NAME=g12-rotd
+		FTP_DIR_NAME=g12-rotd
+		RELEASE_VERSION=g12-rotd-$DATE
+		RELEASE_VERSION_PATERN=g12-rotd-*
+		;;
 	0.12)
 		CHECKOUT_OPTS=-rversion-0_12-branch
 		BASE_TAG_NAME=version-0_12-branch
@@ -206,7 +215,9 @@
 			;;
 	earth)		OPTIMIZE="-O2" ;;
 	saturn)		OPTIMIZE="-O5 --intermodule-optimization" ;;
-	swordfish)	OPTIMIZE="-O4 --intermodule-optimization --constraint-propagation" ;;
+	$G12_ROTD_HOST|swordfish)
+		OPTIMIZE="-O4 --intermodule-optimization --constraint-propagation"
+		;;
 	mundroo|mundula)
 			OPTIMIZE=-O2; use_cp_opt="--use-cp" ;;
 			# On mundroo, "mkdir -p scripts" aborts
@@ -839,12 +850,12 @@

 echo "test_mercury starting to create distribution at `date`" 1>&2

-case $HOST in $ROTD_HOST)
-	# The tests on $ROTD_HOST are run with `--intermodule-optimization',
-	# so we need to do a `mmake realclean' before building the C files
-	# for the source distribution. The extra compilation time for
-	# `--intermodule-optimization' is probably not acceptable for the
-	# source distribution.
+case $HOST in $ROTD_HOST|$G12_ROTD_HOST)
+	# The tests on $ROTD_HOST and $G12_ROTD_HOST are run with
+	# `--intermodule-optimization', so we need to do a `mmake realclean'
+	# before building the C files for the source distribution. The extra
+	# compilation time for `--intermodule-optimization' is probably not
+	# acceptable for the source distribution.
 	{ cd $DIR/mercury &&
 	mmake realclean MMAKEFLAGS=$PARALLEL &&
 	(cd $DIR/tests &&
@@ -1238,7 +1249,7 @@

 # Now rebuild the index files on the www site
 case $HOST in
-    $ROTD_HOST)
+    $ROTD_HOST|$G12_ROTD_HOST)
 	echo "test_mercury generating www index files, starting at `date`" 1>&2
 	(
 	cd $BETA_WEBDIR_TOP &&

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------