[m-rev.] trivial diff: updates to test_mercury

[Fergus Henderson]

Estimated hours taken: 1
Branches: main

tools/test_mercury:
	Some more changes needed as part of my earlier change to
	name the build directories based on the test_mercury options
	(branch name and C compiler).

	Add /home/mercury/public/autoconf-2.52/$FULLARCH/bin to the PATH.
	This is needed for taifun.cs.mu.oz.au, since Peter Ross's
	recent change to configure.in means that Mercury now requires
	a relatively recent version of autoconf.
	Also delete some obsolete entries from the PATH
	(NU-Prolog, SICStus Prolog, Mercury 0.8).

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.157
diff -u -d -r1.157 test_mercury
--- tools/test_mercury	4 Aug 2001 07:16:05 -0000	1.157
+++ tools/test_mercury	6 Aug 2001 12:35:45 -0000
@@ -16,14 +16,11 @@
 esac
 
 PATH="$HOME/bin/$ARCH`awk '/^[^#]/{printf ":%s",$0;}' /home/pgrad/fjh/.path`"
-PATH="/home/mercury/public/mercury-0.8/$FULLARCH/bin:$PATH"
 PATH="/home/mercury/public/mercury-latest/$FULLARCH/bin:$PATH"
 PATH="/home/$HOST/public/mercury-latest/$FULLARCH/bin:$PATH"
-PATH="/home/mercury/public/nuprolog/$FULLARCH/bin:$PATH"
 PATH="/home/mercury/public/gcc-2.7.2/$FULLARCH/bin:$PATH"
 PATH="/home/mercury/public/egcs-1.1b/$FULLARCH/bin:$PATH"
-PATH="/home/mercury/public/autoconf-2.13/$FULLARCH/bin:$PATH"
-PATH="/home/mercury/public/sicstus3/$HOST:$PATH"
+PATH="/home/mercury/public/autoconf-2.52/$FULLARCH/bin:$PATH"
 PATH="/home/mercury/public/$FULLARCH:$PATH"
 PATH="/home/mercury/public/$HOST:$PATH"
 # generate_index_html needs to be in our PATH too
@@ -657,13 +654,13 @@
 	sh configure --prefix=$INSTALL_DIR &&
 	mmake MMAKEFLAGS='EXTRA_MCFLAGS="-O5 --opt-space" -j6' tar &&
 	cd .. &&
-	rm -f $INSTALL_DIR_NAME-unstable/* &&
+	rm -f $UNSTABLE/* &&
 	mv mercury-compiler-$version.tar.gz	\
-	    $INSTALL_DIR_NAME-unstable/mercury-compiler-$version-unstable.tar.gz &&
+	    $UNSTABLE/mercury-compiler-$version-unstable.tar.gz &&
 	mv mercury-extras-$version.tar.gz	\
-	    $INSTALL_DIR_NAME-unstable/mercury-extras-$version-unstable.tar.gz &&
+	    $UNSTABLE/mercury-extras-$version-unstable.tar.gz &&
 	mv mercury-tests-$version.tar.gz	\
-	    $INSTALL_DIR_NAME-unstable/mercury-tests-$version-unstable.tar.gz
+	    $UNSTABLE/mercury-tests-$version-unstable.tar.gz
 	} || status=1
 	# later parts of this script assume that we've already run configure,
 	# so we need to redo that
@@ -854,12 +851,12 @@
 		"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 \
+	rcp $UNSTABLE/mercury-*-$version-unstable.tar.gz \
 		$BETA_FTPHOST:$BETA_FTPDIR 
 	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 \
+	cp $UNSTABLE/mercury-*-$version-unstable.tar.gz \
 		$BETA_WEBDIR
 	;;
 esac

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------