[m-rev.] diff: tools/makebatch $batch.MMAKE.$n

[Zoltan Somogyi]

tools/makebatch:
	Provide a mechanism that allows users to add an arbitrary Mmakefile
	fragment for each version in the batch.

Zoltan.

cvs diff: Diffing .
Index: makebatch
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/makebatch,v
retrieving revision 1.34
diff -u -b -r1.34 makebatch
--- makebatch	17 Oct 2005 02:18:09 -0000	1.34
+++ makebatch	17 Oct 2005 07:44:12 -0000
@@ -5,15 +5,18 @@
 #
 # The control and output files are all in the subdirectory batch.
 # The control files are $batch.MCFLAGS and possibly $batch.CFLAGS,
-# $batch.MGNUCFLAGS, $batch.MLFLAGS, $batch.GRADE, and/or $batch.MMAKE,
-# where $batch is the last argument of makebatch. $batch.CFLAGS,
-# $batch.MGNUCFLAGS, $batch.MLFLAGS, $batch.GRADE and $batch.MMAKE
-# are consulted if they exist.
+# $batch.MGNUCFLAGS, $batch.MLFLAGS, $batch.GRADE, $batch.MMAKE,
+# $batch.MMAKE.$n where $batch is the last argument of makebatch.
+# They are all consulted if they exist.
 #
-# All the control files except $batch.MMAKE must have the same number
-# of lines. Each line corresponds to a version of the compiler that is
-# built with the MCFLAGS, EXTRA_MGNUCFLAGS, EXTRA_CFLAGS and GRADE make
-# variables being set from that line.
+# All the control files except $batch.MMAKE and $batch.MMAKE.$n
+# must have the same number of lines. Each line corresponds to a version
+# of the compiler that is built with the MCFLAGS, EXTRA_CFLAGS,
+# EXTRA_MGNUCFLAGS, EXTRA_MLFLAGS and GRADE make variables being set
+# from that line.
+#
+# The control file $batch.MMAKE.$n contains an Mmakefile fragment that is
+# included in the parameters of the version numbered $n.
 #
 # The control file $batch.MMAKE contains an Mmakefile fragment that is
 # included in the parameters of all the versions being built.
@@ -189,6 +192,11 @@
     then
         mlflags=`awk "NR == $n" batch/$batch.MLFLAGS`
         echo "EXTRA_MLFLAGS = $mlflags" >> Mmake.stage.params
+    fi
+
+    if test -f batch/$batch.MMAKE.$n
+    then
+        cat batch/$batch.MMAKE.$n >> Mmake.stage.params
     fi
 
     if $needgrade
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------