[m-rev.] diff: tools/bootcheck: fix Windows buglets

Fergus Henderson fjh at cs.mu.OZ.AU
Mon Nov 18 21:52:09 AEDT 2002


Estimated hours taken: 0.5
Branches: main, release

tools/bootcheck:
	Fix a couple of bugs that occur when bootchecking on Windows:
	- use $LN rather than $LN_S to link library_strong_name.sn,
	  since the `al' tool doesn't understand Cygwin symlinks
	- remove mercury_mcpp.h before linking it the second time;
	  this avoids an error message about the file already being there
	  due to it having been linked when we processed the *.h pattern.

Workspace: /mnt/mars/home/mars/fjh/ws1/mercury
Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.142
diff -u -d -r1.142 bootcheck
--- tools/bootcheck	8 Nov 2002 00:45:55 -0000	1.142
+++ tools/bootcheck	18 Nov 2002 10:48:32 -0000
@@ -484,7 +484,8 @@
 		cd library
 		$LN_S $root/library/[a-l]*.m .
 		$LN_S $root/library/[m-z]*.m .
-		$LN_S $root/library/library_strong_name.sn .
+		# See comment below for why we use $LN rather than $LN_S here
+		$LN $root/library/library_strong_name.sn .
 		cp $root/library/Mmake* $root/library/Mercury.options .
 		$LN_S $root/library/$STD_LIB_NAME.init .
 		cd $root/stage2
@@ -509,6 +510,7 @@
 			# links (hard links are OK, Cygwin's ln just makes
 			# copies).
 			$LN $root/runtime/*.cpp .
+			rm -f mercury_mcpp.h
 			$LN $root/runtime/mercury_mcpp.h .
 			$LN $root/runtime/mercury_il.il .
 			$LN_S $root/runtime/*.in .

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