[m-dev.] For review: fixes to tools/bootcheck

[Warwick Harvey]

Estimated hours taken: 4

Fixed a couple of problems with the bootcheck script.

tools/bootcheck:
	Changed the stage 2 and 3 builds to always use the stage 1 version
	of `mmake' rather than the installed version (it had been using a
	rather bizarre mix of the two, which made bootstrapping changes to
	mmake rather difficult).  As part of this, made the definitions of
	`MMAKE_VPATH' and `MMAKE_DIR' apply to all invocations of mmake for
	stages 2 and 3, rather than just some of them.

Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.82
diff -u -r1.82 bootcheck
--- bootcheck	1999/06/23 03:09:31	1.82
+++ bootcheck	1999/07/14 03:45:38
@@ -379,7 +379,15 @@
 
 	set -x
 
-	if (cd stage2 && mmake $mmake_opts $jfactor runtime)
+	MMAKE_VPATH=.
+	export MMAKE_VPATH
+	MMAKE_DIR=$root/scripts
+	export MMAKE_DIR
+
+	# Use the new mmake to build stage 2
+	MMAKE=$MMAKE_DIR/mmake
+
+	if (cd stage2 && $MMAKE $mmake_opts $jfactor runtime)
 	then
 		echo "building of stage 2 runtime successful"
 	else
@@ -387,7 +395,7 @@
 		exit 1
 	fi
 
-	if (cd stage2 && mmake $mmake_opts depend_library depend_browser \
+	if (cd stage2 && $MMAKE $mmake_opts depend_library depend_browser \
 		depend_compiler depend_profiler)
 	then
 		echo "building of stage 2 dependencies successful"
@@ -396,14 +404,9 @@
 		exit 1
 	fi
 
-	MMAKE_VPATH=.
-	export MMAKE_VPATH
-	MMAKE_DIR=$root/scripts
-	export MMAKE_DIR
-
 	# the `RM_C=:' ensures that the `.c' files do not get deleted
 
-	if (cd stage2/library && mmake $mmake_opts $jfactor RM_C=: mercury)
+	if (cd stage2/library && $MMAKE $mmake_opts $jfactor RM_C=: mercury)
 	then
 		echo "building of stage 2 library successful"
 	else
@@ -411,7 +414,7 @@
 		exit 1
 	fi
 
-	if (cd stage2/browser && mmake $mmake_opts $jfactor RM_C=: library)
+	if (cd stage2/browser && $MMAKE $mmake_opts $jfactor RM_C=: library)
 	then
 		echo "building of stage 2 browser successful"
 	else
@@ -419,7 +422,7 @@
 		exit 1
 	fi
 
-	if (cd stage2 && mmake $mmake_opts $jfactor trace)
+	if (cd stage2 && $MMAKE $mmake_opts $jfactor trace)
 	then
 		echo "building of stage 2 trace successful"
 	else
@@ -427,18 +430,16 @@
 		exit 1
 	fi
 
-	if (cd stage2/compiler && mmake $mmake_opts $jfactor RM_C=: mercury_compile)
+	if (cd stage2/compiler && $MMAKE $mmake_opts $jfactor RM_C=: \
+		mercury_compile)
 	then
 		echo "building of stage 2 compiler successful"
 	else
 		echo "building of stage 2 compiler not successful"
 		exit 1
 	fi
-
-	unset MMAKE_VPATH
-	unset MMAKE_DIR
 
-	if (cd stage2 && mmake $mmake_opts MMAKEFLAGS=$jfactor all)
+	if (cd stage2 && $MMAKE $mmake_opts MMAKEFLAGS=$jfactor all)
 	then
 		echo "building of stage 2 successful"
 	else
@@ -522,7 +523,16 @@
 	cd $root
 	set -x
 
-	if (cd stage3 && mmake $mmake_opts depend_library depend_browser depend_compiler)
+	MMAKE_VPATH=.
+	export MMAKE_VPATH
+	MMAKE_DIR=$root/scripts
+	export MMAKE_DIR
+
+	# Use the new mmake to build stage 3
+	MMAKE=$MMAKE_DIR/mmake
+
+	if (cd stage3 && $MMAKE $mmake_opts depend_library depend_browser \
+		depend_compiler)
 	then
 		echo "building of stage 3 dependencies successful"
 	else
@@ -530,14 +540,9 @@
 		exit 1
 	fi
 
-	MMAKE_VPATH=.
-	export MMAKE_VPATH
-	MMAKE_DIR=$root/scripts
-	export MMAKE_DIR
-
 	if 	(cd stage3/library &&
-		mmake $mmake_opts $jfactor all-ints &&
-		mmake $mmake_opts $jfactor cs)
+		$MMAKE $mmake_opts $jfactor all-ints &&
+		$MMAKE $mmake_opts $jfactor cs)
 	then
 		echo "building of stage 3 library successful"
 	else
@@ -560,7 +565,7 @@
 		/bin/rm -f $root/stage2/compiler/[t-z]*.o < /dev/null
 	fi
 
-	if (cd stage3/browser && mmake $mmake_opts $jfactor cs)
+	if (cd stage3/browser && $MMAKE $mmake_opts $jfactor cs)
 	then
 		echo "building of stage 3 browser successful"
 	else
@@ -568,7 +573,7 @@
 		exit 1
 	fi
 
-	if (cd stage3/compiler && mmake $mmake_opts $jfactor cs)
+	if (cd stage3/compiler && $MMAKE $mmake_opts $jfactor cs)
 	then
 		echo "building of stage 3 compiler successful"
 	else
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------