[m-rev.] trivial diff: fix bootcheck script on release branch

Julien Fischer juliensf at cs.mu.OZ.AU
Mon May 2 17:22:00 AEST 2005


Estimated hours taken: 0.1
Branches: release

Make the release branch version of the bootcheck script
compatible with the current installed version of the test_mercury
script.

tools/bootcheck:
	Rename the '--copy-profiler' option to '--copy-profilers'
	as per the recent change on the main branch.

Julien.

Index: bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.164
diff -u -r1.164 bootcheck
--- bootcheck	28 Jan 2005 07:12:02 -0000	1.164
+++ bootcheck	2 May 2005 07:18:56 -0000
@@ -60,8 +60,8 @@
 		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.
-	-p, --copy-profiler
-		Copy the profiler directory instead of linking it.
+	-p, --copy-profilers
+		Copy the profiler directories instead of linking them.
 		This is sometimes necessary for bootstrapping changes.
 	-b-, --no-bootcheck
 		Do not run the bootstrap check; execute the test suite and/or
@@ -163,7 +163,7 @@
 test_split_library=false
 copy_runtime=false
 copy_boehm_gc=false
-copy_profiler=false
+copy_profilers=false
 mmake_stage_2=true
 keep_stage_2=false
 keep_stage_3=false
@@ -276,8 +276,8 @@
 	-g|--copy-boehm-gc)
 		copy_boehm_gc=true ;;

-	-p|--copy-profiler)
-		copy_profiler=true ;;
+	-p|--copy-profilers)
+		copy_profilers=true ;;

 	--check-namespace)
 		check_namespace=true ;;
@@ -386,9 +386,9 @@
 		target_opt="--target asm"
 		# If the stage 1 directory was built without --target asm,
 		# but the stage 2 will be built with `--target asm',
-		# then we need to copy the profiler directory.
+		# then we need to copy the profiler directoriess.
 		# So to be safe, we just enable this by default.
-		copy_profiler=true
+		copy_profilers=true
 		;;
 esac
 case $grade in
@@ -396,7 +396,7 @@
 		target_subdir=$ils_subdir
 		target_opt=
 		# See comment above
-		copy_profiler=true
+		copy_profilers=true
 		# The IL back-end generates native Windows executables,
 		# which do not understand symlinks.  So we need to use cp.
 		use_cp=true
@@ -663,7 +663,7 @@
 		$LN_S $root/scripts .
 		$LN_S $root/tools .
 		$LN_S $root/util .
-		if $copy_profiler
+		if $copy_profilers
 		then
 			mkdir profiler
 			cd profiler

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list