[m-rev.] diff: make c2init and ml take the same set of options

Simon Taylor stayl at cs.mu.OZ.AU
Thu Dec 20 02:10:27 AEDT 2001


On 19-Dec-2001, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> On 18-Dec-2001, Simon Taylor <stayl at cs.mu.OZ.AU> wrote:
> > 
> > Finish off the change to make `ml' and `c2init' take the
> > same set of options.
> ...
> > doc/reference_manual.texi:
> > 	Change references to C2INITFLAGS to refer to MLFLAGS instead.
> 
> All the other references to C2INITFLAGS in the Mercury distribution should
> also be changed:


Estimated hours taken: 0.25
Branches: main

bytecode/Mmakefile:
compiler/Mmakefile:
extras/aditi/Mmakefile:
extras/curses/sample/Mmakefile:
extras/graphics/samples/calc/Mmakefile:
extras/graphics/samples/maze/Mmakefile:
extras/graphics/samples/pent/Mmakefile:
extras/morphine/non-regression-tests/Mmakefile:
samples/c_interface/simpler_c_calls_mercury/Mmakefile:
samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile:
tests/benchmarks/Mmakefile:
tests/debugger/Mmakefile:
tests/debugger/declarative/Mmakefile:
tests/hard_coded/Mmakefile:
	Use C2INITARGS or MLFLAGS instead of C2INITFLAGS.

Index: bytecode/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/bytecode/Mmakefile,v
retrieving revision 1.17
diff -u -u -r1.17 Mmakefile
--- bytecode/Mmakefile	19 Feb 2001 02:05:45 -0000	1.17
+++ bytecode/Mmakefile	19 Dec 2001 05:41:47 -0000
@@ -40,7 +40,6 @@
 
 MCFLAGS		= --trace shallow --generate-bytecode -O 0
 
-C2INITFLAGS	= --trace
 MLFLAGS		= --trace
 
 #-----------------------------------------------------------------------------#
Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.48
diff -u -u -r1.48 Mmakefile
--- compiler/Mmakefile	1 Oct 2001 05:34:34 -0000	1.48
+++ compiler/Mmakefile	19 Dec 2001 05:42:23 -0000
@@ -57,9 +57,8 @@
 C2INIT =	MERCURY_MOD_LIB_MODS="$(LIBRARY_DIR)/$(STD_LIB_NAME).init $(RUNTIME_DIR)/$(RT_LIB_NAME).init" \
 		MERCURY_TRACE_LIB_MODS="$(BROWSER_DIR)/$(BROWSER_LIB_NAME).init" \
 		MERCURY_MKINIT=$(UTIL_DIR)/mkinit $(SCRIPTS_DIR)/c2init
-C2INITFLAGS =	--library
 ML	=	MERCURY_C_LIB_DIR=. $(SCRIPTS_DIR)/ml
-MLFLAGS =	--shared --mercury-libs none
+MLFLAGS =	--shared --no-main --mercury-libs none
 MLLIBS  =	../main.$O \
 		$(TRACE_DIR)/lib$(TRACE_LIB_NAME).$A \
 		$(BROWSER_DIR)/lib$(BROWSER_LIB_NAME).$A \
Index: extras/aditi/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/aditi/Mmakefile,v
retrieving revision 1.6
diff -u -u -r1.6 Mmakefile
--- extras/aditi/Mmakefile	21 Nov 2000 23:52:22 -0000	1.6
+++ extras/aditi/Mmakefile	19 Dec 2001 05:42:45 -0000
@@ -33,12 +33,10 @@
 # The RPC headers on Linux don't like it when `-ansi' is passed to gcc.
 MGNUCFLAGS = --no-ansi
 
-MLFLAGS = --use-thread-libs $(ADITI_API_EXTRA_LDFLAGS)
+MLFLAGS = --aditi --use-thread-libs $(ADITI_API_EXTRA_LDFLAGS)
 MLLIBS = $(ADITI_API_EXTRA_LIBS)
 
 MCFLAGS = --no-infer-all --aditi --aditi-user guest
-
-C2INITFLAGS = --aditi
 
 #-----------------------------------------------------------------------------%
 
Index: extras/curses/sample/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/curses/sample/Mmakefile,v
retrieving revision 1.1
diff -u -u -r1.1 Mmakefile
--- extras/curses/sample/Mmakefile	14 Jan 2000 07:21:35 -0000	1.1
+++ extras/curses/sample/Mmakefile	19 Dec 2001 05:43:26 -0000
@@ -10,7 +10,7 @@
 # Note that you have to tell the linker to use the mcurses library
 # AND the ncurses library (which mcurses is an interface for)
 MLLIBS =	-lmcurses -lncurses $(EXTRA_MLLIBS)
-C2INITFLAGS =	$(MCURSES_DIR)/mcurses.init
+C2INITARGS =	$(MCURSES_DIR)/mcurses.init
 
 default_target:	smalltest
 depend:		smalltest.depend
Index: extras/graphics/samples/calc/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/graphics/samples/calc/Mmakefile,v
retrieving revision 1.2
diff -u -u -r1.2 Mmakefile
--- extras/graphics/samples/calc/Mmakefile	6 Sep 1998 08:21:58 -0000	1.2
+++ extras/graphics/samples/calc/Mmakefile	19 Dec 2001 05:43:53 -0000
@@ -17,7 +17,7 @@
 MLFLAGS 	= -R$(MERCURY_TCLTK_DIR) $(EXTRA_MLFLAGS) \
           	  -L$(MERCURY_TCLTK_DIR) 
 MLLIBS 		= -lmercury_tcltk $(EXTRA_MLLIBS)
-C2INITFLAGS 	= $(MERCURY_TCLTK_DIR)/mercury_tcltk.init 
+C2INITARGS 	= $(MERCURY_TCLTK_DIR)/mercury_tcltk.init 
 
 default_target : calc
 
Index: extras/graphics/samples/maze/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/graphics/samples/maze/Mmakefile,v
retrieving revision 1.2
diff -u -u -r1.2 Mmakefile
--- extras/graphics/samples/maze/Mmakefile	6 Sep 1998 08:22:08 -0000	1.2
+++ extras/graphics/samples/maze/Mmakefile	19 Dec 2001 05:44:07 -0000
@@ -18,7 +18,7 @@
 			$(EXTRA_MLFLAGS) -L$(MERCURY_TCLTK_DIR)  \
 			-L$(MERCURY_OPENGL_DIR)
 MLLIBS          = -lmercury_opengl -lmercury_tcltk $(EXTRA_MLLIBS)
-C2INITFLAGS     = $(MERCURY_TCLTK_DIR)/mercury_tcltk.init \
+C2INITARGS      = $(MERCURY_TCLTK_DIR)/mercury_tcltk.init \
 		  $(MERCURY_OPENGL_DIR)/mercury_opengl.init
 
 default_target : maze
Index: extras/graphics/samples/pent/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/graphics/samples/pent/Mmakefile,v
retrieving revision 1.2
diff -u -u -r1.2 Mmakefile
--- extras/graphics/samples/pent/Mmakefile	15 Nov 1999 23:56:52 -0000	1.2
+++ extras/graphics/samples/pent/Mmakefile	19 Dec 2001 05:44:17 -0000
@@ -18,7 +18,7 @@
 			$(EXTRA_MLFLAGS) -L$(MERCURY_TCLTK_DIR)  \
 			-L$(MERCURY_OPENGL_DIR)
 MLLIBS          = -lmercury_opengl -lmercury_tcltk $(EXTRA_MLLIBS)
-C2INITFLAGS     = $(MERCURY_TCLTK_DIR)/mercury_tcltk.init \
+C2INITARGS      = $(MERCURY_TCLTK_DIR)/mercury_tcltk.init \
 		  $(MERCURY_OPENGL_DIR)/mercury_opengl.init
 
 default_target : pent
Index: extras/morphine/non-regression-tests/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/morphine/non-regression-tests/Mmakefile,v
retrieving revision 1.5
diff -u -u -r1.5 Mmakefile
--- extras/morphine/non-regression-tests/Mmakefile	29 Aug 2001 15:19:12 -0000	1.5
+++ extras/morphine/non-regression-tests/Mmakefile	19 Dec 2001 05:44:38 -0000
@@ -18,7 +18,6 @@
 
 MCFLAGS = --trace deep
 MLFLAGS = --trace
-C2INITFLAGS = --trace
 
 # We need to use shared libraries for collect to work.
 # The following is necessary for shared libraries to work on Linux.
Index: samples/c_interface/simpler_c_calls_mercury/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/simpler_c_calls_mercury/Mmakefile,v
retrieving revision 1.6
diff -u -u -r1.6 Mmakefile
--- samples/c_interface/simpler_c_calls_mercury/Mmakefile	18 May 2001 14:23:55 -0000	1.6
+++ samples/c_interface/simpler_c_calls_mercury/Mmakefile	19 Dec 2001 05:45:04 -0000
@@ -21,7 +21,7 @@
 
 # tell Mercury that this the Mercury stuff we're building is a library,
 # not a main program
-C2INITFLAGS=--library
+MLFLAGS=--no-main
 
 #-----------------------------------------------------------------------------#
 
Index: samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile,v
retrieving revision 1.5
diff -u -u -r1.5 Mmakefile
--- samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile	18 May 2001 14:23:55 -0000	1.5
+++ samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile	19 Dec 2001 05:45:20 -0000
@@ -33,7 +33,7 @@
 
 # tell Mercury that this the Mercury stuff we're building is a library,
 # not a main program
-C2INITFLAGS=--library
+MLFLAGS=--no-main
 
 OBJECTS = cpp_main.o mercury_lib_init.o $(mercury_lib.os)
 
Index: tests/benchmarks/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/benchmarks/Mmakefile,v
retrieving revision 1.3
diff -u -u -r1.3 Mmakefile
--- tests/benchmarks/Mmakefile	28 Feb 2001 02:57:06 -0000	1.3
+++ tests/benchmarks/Mmakefile	19 Dec 2001 05:45:55 -0000
@@ -9,7 +9,7 @@
 
 # uncomment the following line to test the performance
 # of the benchmarks (with I/O suppressed)
-# C2INITFLAGS=-w "`extract $(*:_init=) '' BenchEntry`"
+# MLFLAGS=-w "`extract $(*:_init=) '' BenchEntry`"
 
 #-----------------------------------------------------------------------------#
 
Index: tests/debugger/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.59
diff -u -u -r1.59 Mmakefile
--- tests/debugger/Mmakefile	16 Dec 2001 04:46:03 -0000	1.59
+++ tests/debugger/Mmakefile	19 Dec 2001 05:46:19 -0000
@@ -52,7 +52,6 @@
 
 MCFLAGS = --trace deep
 MLFLAGS = --trace
-C2INITFLAGS = --trace
 
 # We need to use shared libraries for interactive queries to work.
 # The following is necessary for shared libraries to work on Linux.
Index: tests/debugger/declarative/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/Mmakefile,v
retrieving revision 1.31
diff -u -u -r1.31 Mmakefile
--- tests/debugger/declarative/Mmakefile	31 May 2001 06:00:21 -0000	1.31
+++ tests/debugger/declarative/Mmakefile	19 Dec 2001 05:46:28 -0000
@@ -52,7 +52,6 @@
 
 MCFLAGS = --trace decl
 MLFLAGS = --trace
-C2INITFLAGS = --trace
 
 MCFLAGS-deep_sub=--trace deep
 MCFLAGS-input_term_dep=--trace rep
Index: tests/hard_coded/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/Mmakefile,v
retrieving revision 1.137
diff -u -u -r1.137 Mmakefile
--- tests/hard_coded/Mmakefile	16 Dec 2001 08:11:17 -0000	1.137
+++ tests/hard_coded/Mmakefile	19 Dec 2001 05:47:08 -0000
@@ -258,13 +258,11 @@
 # tracking it down.
 MLFLAGS-mode_choice = --no-strip
 
-C2INITFLAGS-parse		= 	--trace
 MLFLAGS-parse			=	--trace --static
 
-C2INITFLAGS-split-c-files	= 	--trace
 MLFLAGS-split-c-files		=	--trace
 
-C2INITFLAGS-needs_init		= 	--include-initialization-code --extra-inits
+MLFLAGS-needs_init		= 	--include-initialization-code --extra-inits
 
 # no_fully_strict is expected to fail (it calls error/1).
 # We also need to pipe the output through sed to avoid hard-coding
--------------------------------------------------------------------------
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