diff: fix some scripts in tools directory

David Matthew Overton dmo at cs.mu.OZ.AU
Wed Oct 7 11:27:07 AEST 1998


Zoltan, would you like to review this?

Estimated hours taken: 0.5

tools/binary:
tools/binary_step:
tools/linear:
	Update these scripts to work properly with the new browser and
	trace directories and the renamed libraries.

Index: binary
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/binary,v
retrieving revision 1.17
diff -u -r1.17 binary
--- 1.17	1998/06/01 06:14:58
+++ binary	1998/10/07 01:08:34
@@ -208,7 +208,7 @@
 cd library
 ln -s $root/library/[a-l]*.m .
 ln -s $root/library/[m-z]*.m .
-ln -s $root/library/libmercury.init .
+ln -s $root/library/libmer_std.init .
 cp $root/library/Mmake* .
 cd $root/stage2
 if "$copy_runtime"
@@ -226,6 +226,8 @@
 	ln -s $root/runtime .
 fi
 ln -s $root/boehm_gc .
+ln -s $root/browser .
+ln -s $root/trace .
 ln -s $root/doc .
 ln -s $root/scripts .
 ln -s $root/util .
@@ -248,6 +250,8 @@
 cp stage2.ok/library/*.int3 stage2/library
 cp stage2.ok/library/*.date stage2/library
 cp stage2.ok/library/*.h stage2/library
+cp stage2.ok/library/*.optdate stage2/library
+cp stage2.ok/library/*.trans_opt_date stage2/library
 # cp stage2.ok/compiler/*.d stage2/compiler
 cp stage2.ok/compiler/*.dep stage2/compiler
 cp stage2.ok/compiler/*.int stage2/compiler
@@ -255,7 +259,7 @@
 cp stage2.ok/compiler/*.int3 stage2/compiler
 cp stage2.ok/compiler/*.date stage2/compiler
 
-if test $bootcheck = ""
+if test "$bootcheck" = ""
 then
 	cd $root
 	[ -d stage3 ] || mkdir stage3
@@ -279,7 +283,7 @@
 	cd library
 	ln -s $root/library/[a-l]*.m .
 	ln -s $root/library/[m-z]*.m .
-	ln -s $root/library/libmercury.init .
+	ln -s $root/library/libmer_std.init .
 	cp $root/library/Mmake* .
 	cd $root/stage3
 	ln -s $root/boehm_gc .
Index: binary_step
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/binary_step,v
retrieving revision 1.11
diff -u -r1.11 binary_step
--- 1.11	1998/05/12 06:05:47
+++ binary_step	1998/10/06 10:43:06
@@ -133,7 +133,7 @@
 
 root=`/bin/pwd`
 
-MERCURY_COMPILER=$root/stage1/mercury_compile
+MERCURY_COMPILER=$root/compiler/mercury_compile
 export MERCURY_COMPILER
 MERCURY_INT_DIR=$root/stage2/library
 export MERCURY_INT_DIR
@@ -157,7 +157,7 @@
 
 # Rebuild the stage2 library and compiler from the components already there.
 
-/bin/rm -f stage2/library/libmercury.a stage2/library/libmercury.so
+/bin/rm -f stage2/library/libmer_std.a stage2/library/libmer_std.so
 /bin/rm -f stage2/compiler/mercury_compile
 
 set -x
@@ -164,7 +164,7 @@
 
 # the `RM_C=:' ensures that the `.c' files do not get deleted
 
-if (cd stage2/library ; mmake $mmake_opts $jfactor RM_C=: libmercury)
+if (cd stage2/library ; mmake $mmake_opts $jfactor RM_C=: )
 then
 	echo "building of stage 2 library successful"
 else
Index: linear
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/linear,v
retrieving revision 1.3
diff -u -r1.3 linear
--- 1.3	1997/07/21 06:26:42
+++ linear	1998/10/07 01:25:43
@@ -11,8 +11,8 @@
 # versions, then the script stops after identifying only the file.
 #
 # The test for the composite stage2 compiler is either bootstrap checking
-# (the default, or the successful execution of the all the test cases in
-# one or more dubdirectories of the tests directory.
+# (the default), or the successful execution of the all the test cases in
+# one or more subdirectories of the tests directory.
 
 usage="\
 Usage: $0 [options]
@@ -152,7 +152,7 @@
 cd library
 ln -s $root/library/*.m .
 # ln -s $root/library/*.nl .
-ln -s $root/library/libmercury.init .
+ln -s $root/library/libmer_std.init .
 cp $root/library/Mmake* .
 cd $root/stage2
 if test "$copy_runtime" = "true"
@@ -170,6 +170,8 @@
 	ln -s $root/runtime .
 fi
 ln -s $root/boehm_gc .
+ln -s $root/browser .
+ln -s $root/trace .
 ln -s $root/doc .
 ln -s $root/scripts .
 ln -s $root/util .
-- 
David Overton
MEngSc Student                       Email: dmo at cs.mu.oz.au     
Department of Computer Science       Web: http://www.cs.mu.oz.au/~dmo
The University of Melbourne          Phone: +61 3 9344 9159



More information about the developers mailing list