[m-dev.] trivial diff: minor fixes to tools/bootcheck

Fergus Henderson fjh at cs.mu.OZ.AU
Wed Oct 20 14:14:33 AEST 1999


Estimated hours taken: 0.25

tools/bootcheck:
	Change a couple of places to use `find | xargs' to avoid
	overflowing fixed-length limits on the command line length.
	Also change a couple of places to use `rm -f' rather than `rm',
	to avoid spurious error messages from `rm' if the file doesn't exist.

Workspace: /mount/munkora/clp/mercury/public/test_mercury/test_dirs/munta/mercury
Index: tools/bootcheck
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/bootcheck,v
retrieving revision 1.87
diff -u -d -r1.87 bootcheck
--- 1.87	1999/10/06 00:13:48
+++ bootcheck	1999/10/20 04:08:35
@@ -326,7 +326,7 @@
 	then
 		# Remove symbolic link to the stage 1 runtime if it's present,
 		# which it can be with the -2 option.
-		rm runtime
+		rm -f runtime
 		mkdir runtime
 		cd runtime
 		$LN_S $root/runtime/*.h .
@@ -335,7 +335,7 @@
 		cp $root/runtime/Mmake* .
 		$LN_S $root/runtime/machdeps .
 		cd $root/stage2
-		rm trace
+		rm -f trace
 		mkdir trace
 		cd trace
 		$LN_S $root/trace/*.h .
@@ -350,7 +350,7 @@
 	then
 		# Remove symbolic link to the stage 1 gc if it's present,
 		# which it can be with the -2 option.
-		rm boehm_gc
+		rm -f boehm_gc
 		mkdir boehm_gc
 		cd boehm_gc
 		$LN_S $root/boehm_gc/*.h .
@@ -476,8 +476,8 @@
 	then
 		true
 	else
-		/bin/rm -f $root/stage2/library/[a-l]*.o < /dev/null
-		/bin/rm -f $root/stage2/library/[m-z]*.o < /dev/null
+		find $root/stage2/library -name "*.o" -print |
+		xargs /bin/rm -f < /dev/null
 	fi
 
 	MERCURY_COMPILER=$root/stage2/compiler/mercury_compile
@@ -594,9 +594,8 @@
 	then
 		true
 	else
-		/bin/rm -f $root/stage2/compiler/[a-l]*.o < /dev/null
-		/bin/rm -f $root/stage2/compiler/[i-s]*.o < /dev/null
-		/bin/rm -f $root/stage2/compiler/[t-z]*.o < /dev/null
+		find $root/stage2/compiler -name "*.o" |
+		xargs /bin/rm -f < /dev/null
 	fi
 
 	if (cd stage3/browser && $MMAKE $mmake_opts $jfactor cs)

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the developers mailing list