[m-dev.] diff: tools/binary update

[Zoltan Somogyi]

tools/binary:
tools/binary_step:
	Update the binary script and its helper to accommodate the changes
	in the compilation environment in the last year or so.

Zoltan.

cvs diff: Diffing .
Index: binary
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/binary,v
retrieving revision 1.18
diff -u -b -r1.18 binary
--- binary	1998/10/09 05:41:56	1.18
+++ binary	2000/03/27 03:20:00
@@ -5,7 +5,7 @@
 # (stage2.bad), both of which must have their object files, this script
 # uses binary search to try to find in stage2.bad first the C source file
 # and then the module within that C source file that, when put together
-# with everthing else from the stage2.ok directory, still causes the
+# with everything else from the stage2.ok directory, still causes the
 # compiler to fail.
 #
 # If the bad C source file has different numbers of modules in the bad and ok
@@ -205,8 +205,10 @@
 mkdir compiler
 cd compiler
 ln -s $root/compiler/[a-h]*.m .
-ln -s $root/compiler/[i-s]*.m .
+ln -s $root/compiler/[i-o]*.m .
+ln -s $root/compiler/[p-s]*.m .
 ln -s $root/compiler/[t-z]*.m .
+ln -s $root/compiler/*.pp .
 cp $root/compiler/Mmake* .
 cd $root/stage2
 mkdir library
@@ -222,7 +224,6 @@
 	cd runtime
 	ln -s $root/runtime/*.h .
 	ln -s $root/runtime/*.c .
-	ln -s $root/runtime/*.mod .
 	ln -s $root/runtime/*.in .
 	ln -s $root/runtime/machdeps .
 	cp $root/runtime/Mmake* .
@@ -238,9 +239,9 @@
 ln -s $root/util .
 ln -s $root/profiler .
 ln -s $root/conf* .
+ln -s $root/aclocal.m4 .
 ln -s $root/VERSION .
-ln -s $root/.README.in .
-ln -s $root/.INSTALL.in .
+ln -s $root/.*.in .
 rm -f config*.log
 cp $root/stage2.ok/Mmake* .
 cd $root
@@ -250,18 +251,24 @@
 
 # cp stage2.ok/library/*.d stage2/library
 cp stage2.ok/library/*.dep stage2/library
+cp stage2.ok/library/*.dv stage2/library
+cp stage2.ok/library/*.int3 stage2/library
+cp stage2.ok/library/*.date3 stage2/library
 cp stage2.ok/library/*.int stage2/library
 cp stage2.ok/library/*.int2 stage2/library
-cp stage2.ok/library/*.int3 stage2/library
 cp stage2.ok/library/*.date stage2/library
-cp stage2.ok/library/*.h stage2/library
+cp stage2.ok/library/*.opt stage2/library
 cp stage2.ok/library/*.optdate stage2/library
+cp stage2.ok/library/*.trans_opt stage2/library
 cp stage2.ok/library/*.trans_opt_date stage2/library
+cp stage2.ok/library/*.h stage2/library
 # cp stage2.ok/compiler/*.d stage2/compiler
 cp stage2.ok/compiler/*.dep stage2/compiler
+cp stage2.ok/compiler/*.dv stage2/compiler
+cp stage2.ok/compiler/*.int3 stage2/compiler
+cp stage2.ok/compiler/*.date3 stage2/compiler
 cp stage2.ok/compiler/*.int stage2/compiler
 cp stage2.ok/compiler/*.int2 stage2/compiler
-cp stage2.ok/compiler/*.int3 stage2/compiler
 cp stage2.ok/compiler/*.date stage2/compiler
 
 if test "$bootcheck" = ""
@@ -280,8 +287,10 @@
 	# This is needed to cope with small limits
 	# on the size of argument vectors.
 	ln -s $root/compiler/[a-h]*.m .
-	ln -s $root/compiler/[i-s]*.m .
+	ln -s $root/compiler/[i-o]*.m .
+	ln -s $root/compiler/[p-s]*.m .
 	ln -s $root/compiler/[t-z]*.m .
+	ln -s $root/compiler/*.pp .
 	cp $root/compiler/Mmake* .
 	cd $root/stage3
 	mkdir library
@@ -298,9 +307,9 @@
 	ln -s $root/runtime .
 	ln -s $root/util .
 	ln -s $root/conf* .
+	ln -s $root/aclocal.m4 .
 	ln -s $root/VERSION .
-	ln -s $root/.README.in .
-	ln -s $root/.INSTALL.in .
+	ln -s $root/.*.in .
 	rm -f config*.log
 	/bin/rm -f Mmake*
 	cp $root/stage2.$basis/Mmake* .
@@ -328,6 +337,7 @@
 	set +x
 	echo linking stage2/library from stage2.bad/library 1>&2
 	cp stage2.bad/library/*.[co] stage2/library
+	cp stage2.bad/library/*.pic_o stage2/library
 	echo linking stage2/compiler from stage2.ok/compiler 1>&2
 	cp stage2.ok/compiler/*.[co] stage2/compiler
 	set -x
@@ -364,6 +374,7 @@
 set +x
 echo linking stage2 from stage2.$base 1>&2
 cp stage2.$base/library/*.[co] stage2/library
+cp stage2.$base/library/*.pic_o stage2/library
 cp stage2.$base/compiler/*.[co] stage2/compiler
 set -x
 
@@ -399,6 +410,7 @@
 	for module in $tested
 	do
 		cp stage2.$trial/$testeddir/$module.[co] stage2/$testeddir
+		cp stage2.$trial/$testeddir/$module.pic_o stage2/$testeddir
 	done
 
 	if "$negative"
Index: binary_step
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/binary_step,v
retrieving revision 1.12
diff -u -b -r1.12 binary_step
--- binary_step	1998/10/09 05:41:57	1.12
+++ binary_step	2000/03/27 03:17:54
@@ -157,7 +157,36 @@
 
 sleep 2
 
+touch stage2/library/*.int3
+touch stage2/compiler/*.int3
+
+sleep 2
+
+touch stage2/library/*.date3
+touch stage2/compiler/*.date3
+
+touch stage2/library/*.int2
+touch stage2/library/*.int
+touch stage2/compiler/*.int2
+touch stage2/compiler/*.int
+
+sleep 2
+
+touch stage2/library/*.date
+touch stage2/compiler/*.date
+
+touch stage2/library/*.opt
+
+sleep 2
+
+touch stage2/library/*.optdate
+touch stage2/library/*.trans_opt
+
+sleep 2
+
+touch stage2/library/*.trans_opt_date
 touch stage2/library/*.o
+touch stage2/library/*.pic_o
 touch stage2/compiler/*.o
 
 # Rebuild the stage2 library and compiler from the components already there.
@@ -216,18 +245,22 @@
 	/bin/rm -f stage3/library/*.c
 	/bin/rm -f stage3/library/*.d
 	/bin/rm -f stage3/library/*.optdate
+	/bin/rm -f stage3/library/*.trans_opt_date
 	/bin/rm -f stage3/library/*.date3
 	/bin/rm -f stage3/library/*.date
 	/bin/rm -f stage3/library/*.opt
+	/bin/rm -f stage3/library/*.trans_opt
 	/bin/rm -f stage3/library/*.int3
 	/bin/rm -f stage3/library/*.int2
 	/bin/rm -f stage3/library/*.int
 	/bin/rm -f stage3/compiler/*.c
 	/bin/rm -f stage3/compiler/*.d
 	/bin/rm -f stage3/compiler/*.optdate
+	/bin/rm -f stage3/compiler/*.trans_opt_date
 	/bin/rm -f stage3/compiler/*.date3
 	/bin/rm -f stage3/compiler/*.date
 	/bin/rm -f stage3/compiler/*.opt
+	/bin/rm -f stage3/compiler/*.trans_opt
 	/bin/rm -f stage3/compiler/*.int3
 	/bin/rm -f stage3/compiler/*.int2
 	/bin/rm -f stage3/compiler/*.int
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------