[m-rev.] diff: making tools/binary work again

[Zoltan Somogyi]

tools/binary:
tools/divide:
tools/linear:
	Fix some software rot in these scripts: we now need main.[co] in
	the top level directory, and END_MODULE is now spelt MR_END_MODULE.

Zoltan.

cvs diff: Diffing .
Index: binary
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/binary,v
retrieving revision 1.20
diff -u -b -r1.20 binary
--- binary	2000/07/19 03:45:11	1.20
+++ binary	2001/11/03 12:20:46
@@ -245,6 +245,7 @@
 $RMSTAGECMD $trueroot/stage2/* < /dev/null
 echo linking stage 2... 1>&2
 cd stage2
+ln -s $root/main.c .
 mkdir compiler
 cd compiler
 ln -s $root/compiler/[a-h]*.m .
@@ -324,6 +325,7 @@
 	$RMSTAGECMD $trueroot/stage3/* < /dev/null
 	echo linking stage 3... 1>&2
 	cd stage3
+	ln -s $root/main.c
 	mkdir compiler
 	cd compiler
 	# Break up the links into several chunks.
@@ -373,6 +375,7 @@
 	fi
 fi
 
+cp stage2.ok/main.o stage2
 if test "$alldirs" = ""
 then
 	echo testing whether the stage2.bad library works
@@ -538,8 +541,8 @@
 echo "there is a problem in $testeddir/$module"
 echo
 
-basecnt=`egrep '^END_MODULE' stage2.$base/$testeddir/$module.c | wc -l`
-trialcnt=`egrep '^END_MODULE' stage2.$trial/$testeddir/$module.c | wc -l`
+basecnt=`egrep '^MR_END_MODULE' stage2.$base/$testeddir/$module.c | wc -l`
+trialcnt=`egrep '^MR_END_MODULE' stage2.$trial/$testeddir/$module.c | wc -l`
 
 if test $basecnt -ne $trialcnt
 then
Index: divide
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/divide,v
retrieving revision 1.2
diff -u -b -r1.2 divide
--- divide	1996/05/13 05:10:23	1.2
+++ divide	2001/11/03 10:36:16
@@ -23,7 +23,7 @@
 while test $i -lt $2
 do
 	ed - tmp > /dev/null << END
-	/^END_MODULE/
+	/^MR_END_MODULE/
 	1,.w $1.part.$i
 	1,.d
 	w
Index: linear
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/linear,v
retrieving revision 1.4
diff -u -b -r1.4 linear
--- linear	1998/10/09 05:41:58	1.4
+++ linear	2001/11/03 10:38:16
@@ -254,8 +254,8 @@
 		else
 			unusual="$unusual $testeddir/$testedmodule"
 
-			basecnt=`egrep '^END_MODULE' stage2.$base/$testeddir/$testedmodule.c | wc -l`
-			trialcnt=`egrep '^END_MODULE' stage2.$trial/$testeddir/$testedmodule.c | wc -l`
+			basecnt=`egrep '^MR_END_MODULE' stage2.$base/$testeddir/$testedmodule.c | wc -l`
+			trialcnt=`egrep '^MR_END_MODULE' stage2.$trial/$testeddir/$testedmodule.c | wc -l`
 
 			if test $basecnt -ne $trialcnt
 			then
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------