[m-dev.] For review: change bootcheck to copy the boehm collector

[Thomas Charles CONWAY]

Zoltan Somogyi, you write:
> 
> > +	-R, --copy-runtime --copy-boehm-gc
> > +		Copy the runtime and boehm_gc directories instead of linking
> > +		them.  This is necessary if one wants to bootcheck a grade
> > +		that is not compatible with the standard one for the boehm
> > +		collector as well as the runtime.
> 
> --copy-boehm-gc and -R should be documented separately, since they have
> different meanings.
> 
> Apart from that, the diff is fine.
> 

In that case I'll commit the following revised diff.

-- 
Thomas Conway <conway at cs.mu.oz.au>
Nail here [] for new monitor.  )O+

cvs diff: Diffing .
Index: bootcheck
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/bootcheck,v
retrieving revision 1.61
diff -u -r1.61 bootcheck
--- bootcheck	1998/08/31 04:14:15	1.61
+++ bootcheck	1998/09/10 07:43:56
@@ -24,6 +24,12 @@
 		Copy the runtime directory instead of linking it.
 		This is necessary if one wants to bootcheck a grade
 		that is not compatible with the standard one.
+	--copy-boehm-gc
+		Copy the bohem_gc directory instead of linking it.
+		This is necessary if one wants to bootcheck a grade
+		that is not compatible with the standard one.
+	-R
+		Implies both --copy-runtime and --copy-boehm-gc.
 	-p, --copy-profiler
 		Copy the profiler directory instead of linking it.
 		This is sometimes necessary for bootstrapping
@@ -62,6 +68,7 @@
 runtests=true
 do_bootcheck=true
 copy_runtime=false
+copy_boehm_gc=false
 copy_profiler=false
 keep_stage_2=false
 keep_stage_3=false
@@ -105,6 +112,13 @@
 	-r|--copy-runtime)
 		copy_runtime=true ;;
 
+	--copy-boehm-gc)
+		copy_boehm_gc=true ;;
+
+	-R)
+		copy_runtime=true
+		copy_boehm_gc=true ;;
+
 	-s|--sicstus)
 		test_sicstus=true ;;
 
@@ -261,7 +275,23 @@
 	else
 		ln -s $root/runtime .
 	fi
-	ln -s $root/boehm_gc .
+	if "$copy_boehm_gc"
+	then
+		# Remove symbolic link to the stage 1 boehm_gc if it's present,
+		# which it can be with the -2 option.
+		rm boehm_gc
+		mkdir boehm_gc
+		cd boehm_gc
+		ln -s $root/boehm_gc/*.h .
+		ln -s $root/boehm_gc/*.c .
+		ln -s $root/boehm_gc/*.s .
+		ln -s $root/boehm_gc/includes .
+		cp $root/boehm_gc/Mmake* .
+		cp $root/boehm_gc/Makefile .
+		cd $root/stage2_sicstus
+	else
+		ln -s $root/boehm_gc .
+	fi
 	ln -s $root/doc .
 	ln -s $root/scripts .
 	ln -s $root/util .
@@ -448,8 +478,22 @@
 		cd $root/stage2
 	else
 		ln -s $root/runtime .
+	fi
+	if test "$copy_boehm_gc" = "true"
+	then
+		mkdir boehm_gc
+		cd boehm_gc
+		ln -s $root/boehm_gc/*.h .
+		ln -s $root/boehm_gc/*.c .
+		ln -s $root/boehm_gc/*.s .
+		ln -s $root/boehm_gc/includes .
+		cp $root/boehm_gc/Mmake* .
+		cp $root/boehm_gc/Makefile .
+		ln -s $root/boehm_gc/machdeps .
+		cd $root/stage2
+	else
+		ln -s $root/boehm_gc .
 	fi
-	ln -s $root/boehm_gc .
 	ln -s $root/doc .
 	ln -s $root/scripts .
 	ln -s $root/util .