Fix some scripts in the tools directory to work with the new

Estimated hours taken: 0.5

Fix some scripts in the tools directory to work with the new
directories and library names.

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

Mmake.common.in:
scripts/c2init.in:
scripts/ml.in:
	Add tools/binary, tools/binary_step and tools/linear to the
	list of files that know about library names.

Mmake.common.in

@@ -177,7 +177,8 @@ UTIL_DIR = $(MERCURY_DIR)/util
 # since it contains no Mercury code.)
 #
 # If you change these, you will also need to change scripts/ml.in,
-# scripts/c2init.in and tools/bootcheck.
+# scripts/c2init.in, tools/bootcheck, tools/binary, tools/binary_step
+# and tools/linear.
 RT_LIB_NAME = mer_rt
 STD_LIB_NAME = mer_std
 TRACE_LIB_NAME = mer_trace

scripts/c2init.in

@@ -53,7 +53,8 @@ Environment variables:
 "
 
 # If you change these, you will also need to change Mmake.common.in,
-# scripts/ml.in and tools/bootcheck.
+# scripts/ml.in, tools/bootcheck, tools/binary, tools/binary_step and
+# tools/linear.
 RT_LIB_NAME=mer_rt
 STD_LIB_NAME=mer_std
 TRACE_LIB_NAME=mer_trace

scripts/ml.in

@@ -86,7 +86,8 @@ SHLIB_RPATH_SEP=${MERCURY_SHLIB_RPATH_SEP="@SHLIB_RPATH_SEP@"}
 SHARED_LIBS=${MERCURY_SHARED_LIBS="@SHARED_LIBS@"}
 
 # If you change these, you will also need to change Mmake.common.in,
-# scripts/c2init.in and tools/bootcheck.
+# scripts/c2init.in, tools/bootcheck, tools/binary, tools/binary_step
+# and tools/linear.
 RT_LIB_NAME=mer_rt
 STD_LIB_NAME=mer_std
 TRACE_LIB_NAME=mer_trace

tools/binary

@@ -56,6 +56,11 @@ Options:
 		Execute runtests from the named subdirectory of tests.
 "
 
+# If you change this, you will also need to change scripts/ml.in,
+# scripts/c2init.in, Mmake.common.in, tools/bootcheck, tools/binary_step
+# and tools/linear.
+STD_LIB_NAME=mer_std
+
 set -x
 
 bootcheck=""
@@ -208,7 +213,7 @@ mkdir library
 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/lib$STD_LIB_NAME.init .
 cp $root/library/Mmake* .
 cd $root/stage2
 if "$copy_runtime"
@@ -226,6 +231,8 @@ else
 	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 +255,8 @@ cp stage2.ok/library/*.int2 stage2/library
 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 +264,7 @@ cp stage2.ok/compiler/*.int2 stage2/compiler
 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 +288,7 @@ then
 	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/lib$STD_LIB_NAME.init .
 	cp $root/library/Mmake* .
 	cd $root/stage3
 	ln -s $root/boehm_gc .

tools/binary_step

@@ -37,6 +37,11 @@ Options:
 		Execute runtests from the named subdirectory of tests.
 "
 
+# If you change this, you will also need to change scripts/ml.in,
+# scripts/c2init.in, Mmake.common.in, tools/bootcheck, tools/binary
+# and tools/linear.
+STD_LIB_NAME=mer_std
+
 set -x
 
 alltestdirs="benchmarks general hard_coded invalid valid warnings"
@@ -133,7 +138,7 @@ done
 
 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,14 +162,14 @@ touch stage2/compiler/*.o
 
 # 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/lib$STD_LIB_NAME.a stage2/library/lib$STD_LIB_NAME.so
 /bin/rm -f stage2/compiler/mercury_compile
 
 set -x
 
 # 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

tools/bootcheck

@@ -75,7 +75,8 @@ test_sicstus=false
 use_subdirs=${MMAKE_USE_SUBDIRS=no}
 
 # If you change these, you will also need to change scripts/ml.in,
-# scripts/c2init.in and Mmake.common.in.
+# scripts/c2init.in, Mmake.common.in, tools/binary, tools/binary_step
+# and tools/linear.
 RT_LIB_NAME=mer_rt
 STD_LIB_NAME=mer_std
 TRACE_LIB_NAME=mer_trace

tools/linear

@@ -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
+# (the default), or the successful execution of the all the test cases in
-# one or more dubdirectories of the tests directory.
+# one or more subdirectories of the tests directory.
 
 usage="\
 Usage: $0 [options]
@@ -43,6 +43,11 @@ Options:
 		Execute runtests from the named subdirectory of tests.
 "
 
+# If you change this, you will also need to change scripts/ml.in,
+# scripts/c2init.in, Mmake.common.in, tools/bootcheck, tools/binary
+# and tools/binary_step.
+STD_LIB_NAME=mer_std
+
 bootcheck=""
 compile_only=""
 jfactor=
@@ -152,7 +157,7 @@ mkdir library
 cd library
 ln -s $root/library/*.m .
 # ln -s $root/library/*.nl .
-ln -s $root/library/libmercury.init .
+ln -s $root/library/lib$STD_LIB_NAME.init .
 cp $root/library/Mmake* .
 cd $root/stage2
 if test "$copy_runtime" = "true"
@@ -170,6 +175,8 @@ else
 	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 .