[m-dev.] trivial diff: minor updates to test_mercury

[Fergus Henderson]

Estimated hours taken: 0.5

tools/test_mercury:
	- Update to test the version-0_10_y branch rather
	  than the version-0_10_x branch.
	- Re-enable some `echo rm' commands that I missed in my earlier
	  change.  I changed them to be a bit more conservative
	  (using {compiler,extras,tests} rather than `*').

Workspace: /home/mercury/public/test_mercury/scripts/mercury
Index: tools/test_mercury
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/test_mercury,v
retrieving revision 1.139
diff -u -d -r1.139 test_mercury
--- tools/test_mercury	2001/02/19 06:04:37	1.139
+++ tools/test_mercury	2001/02/27 07:11:20
@@ -102,10 +102,14 @@
 		RELEASE_VERSION_PATTERN=rotd-*
 		;;
 	mercury-0.10)
-		CHECKOUT_OPTS=-rversion-0_10_x
-		BASE_TAG_NAME=version-0_10_x
-		RELEASE_VERSION=0.10-beta-$DATE
-		RELEASE_VERSION_PATTERN=0.10-beta-*
+		#CHECKOUT_OPTS=-rversion-0_10
+		#BASE_TAG_NAME=version-0_10_y
+		#RELEASE_VERSION=0.10
+		#RELEASE_VERSION_PATTERN=0.10-*
+		CHECKOUT_OPTS=-rversion-0_10_y
+		BASE_TAG_NAME=version-0_10_y
+		RELEASE_VERSION=0.10.1-beta-$DATE
+		RELEASE_VERSION_PATTERN=0.10.1-beta-*
 		;;
 esac
 
@@ -718,13 +722,17 @@
 : update the unstable release
 
 case $HOST in murlibobo)
-	# XXX should remove old files
 	rsh $BETA_FTPHOST \
-		"echo rm -f $BETA_FTPDIR/mercury-*-$RELEASE_VERSION_PATTERN-unstable.tar.gz" &&
+		"rm -f $BETA_FTPDIR/mercury-compiler-$RELEASE_VERSION_PATTERN-unstable.tar.gz" &&
+	rsh $BETA_FTPHOST \
+		"rm -f $BETA_FTPDIR/mercury-extras-$RELEASE_VERSION_PATTERN-unstable.tar.gz" &&
+	rsh $BETA_FTPHOST \
+		"rm -f $BETA_FTPDIR/mercury-tests-$RELEASE_VERSION_PATTERN-unstable.tar.gz" &&
 	rcp $INSTALL_DIR_NAME-unstable/mercury-*-$version-unstable.tar.gz \
 		$BETA_FTPHOST:$BETA_FTPDIR 
-	# XXX should remove old files
-	echo rm -f $BETA_WEBDIR/mercury-*-$RELEASE_VERSION_PATTERN-unstable.tar.gz &&
+	rm -f $BETA_WEBDIR/mercury-compiler-$RELEASE_VERSION_PATTERN-unstable.tar.gz &&
+	rm -f $BETA_WEBDIR/mercury-extras-$RELEASE_VERSION_PATTERN-unstable.tar.gz &&
+	rm -f $BETA_WEBDIR/mercury-tests-$RELEASE_VERSION_PATTERN-unstable.tar.gz &&
 	cp $INSTALL_DIR_NAME-unstable/mercury-*-$version-unstable.tar.gz \
 		$BETA_WEBDIR
 	;;
@@ -844,9 +852,9 @@
 	    $LN $BETA_FTPDIR/mercury-tests-$version-unstable.tar.gz \
 	        $BETA_FTPDIR/mercury-tests-$version.tar.gz" &&
 
-		# XXX should remove old files
-	    echo rm -f $BETA_WEBDIR/mercury-*-$RELEASE_VERSION_PATTERN[0-9].tar.gz &&
-	    echo rm -f $BETA_WEBDIR/mercury-*-$version.tar.gz && 
+	    rm -f $BETA_WEBDIR/mercury-compiler-$RELEASE_VERSION_PATTERN[0-9].tar.gz &&
+	    rm -f $BETA_WEBDIR/mercury-extras-$RELEASE_VERSION_PATTERN[0-9].tar.gz &&
+	    rm -f $BETA_WEBDIR/mercury-tests-$RELEASE_VERSION_PATTERN[0-9].tar.gz &&
 	    $LN $BETA_WEBDIR/mercury-compiler-$version-unstable.tar.gz \
 	        $BETA_WEBDIR/mercury-compiler-$version.tar.gz &&
 	    $LN $BETA_WEBDIR/mercury-extras-$version-unstable.tar.gz \

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------