[MLton-commit] r7077

[Matthew Fluet]

Simplify SML/NJ build.
----------------------------------------------------------------------

U   mlton/trunk/Makefile
U   mlton/trunk/mlton/Makefile

----------------------------------------------------------------------

Modified: mlton/trunk/Makefile
===================================================================
--- mlton/trunk/Makefile	2009-04-13 20:53:45 UTC (rev 7076)
+++ mlton/trunk/Makefile	2009-04-13 20:53:47 UTC (rev 7077)
@@ -233,17 +233,11 @@
 
 .PHONY: smlnj-mlton-dual
 smlnj-mlton-dual:
-	$(MAKE) dirs runtime
-	$(MAKE) -C "$(COMP)" smlnj-mlton-dual
-	$(MAKE) script basis-no-check mlbpathmap targetmap constants libraries-no-check
-	@echo 'Build of MLton succeeded.'
+	$(MAKE) SMLNJ_CM_SERVERS=2 smlnj-mlton
 
 .PHONY: smlnj-mlton-quad
 smlnj-mlton-quad:
-	$(MAKE) dirs runtime
-	$(MAKE) -C "$(COMP)" smlnj-mlton-quad
-	$(MAKE) script basis-no-check mlbpathmap targetmap constants libraries-no-check
-	@echo 'Build of MLton succeeded.'
+	$(MAKE) SMLNJ_CM_SERVERS=4 smlnj-mlton
 
 .PHONY: targetmap
 targetmap:

Modified: mlton/trunk/mlton/Makefile
===================================================================
--- mlton/trunk/mlton/Makefile	2009-04-13 20:53:45 UTC (rev 7076)
+++ mlton/trunk/mlton/Makefile	2009-04-13 20:53:47 UTC (rev 7077)
@@ -113,6 +113,7 @@
 # of MLton.
 #
 SMLNJ	:= sml
+SMLNJ_CM_SERVERS := 0
 
 .PHONY: smlnj-mlton
 smlnj-mlton: $(SOURCES)
@@ -123,42 +124,15 @@
 		echo '#set CM.Control.verbose false;';				\
 		echo '#set CM.Control.warn_obsolete false;';			\
 		echo 'Control.polyEqWarn := false;';				\
+		echo 'local';							\
+		echo 'fun loop 0 = () | loop n = (CM.Server.start {cmd = (CommandLine.name (), ["@CMslave"]), name = "server" ^ (Int.toString n), pathtrans = NONE, pref = 0}; loop (n - 1));'; \
+		echo 'in';							\
+		echo 'val _ = loop $(SMLNJ_CM_SERVERS);';			\
+		echo 'end;';							\
 		echo 'CM.make "mlton-smlnj.cm";';				\
 		echo 'SMLofNJ.exportFn("$(LIB)/mlton-smlnj",Main.main);'	\
 	) | "$(SMLNJ)"
 
-.PHONY: smlnj-mlton-dual
-smlnj-mlton-dual: $(SOURCES)
-	rm -f control/version.sml
-	$(MAKE) control/version.sml
-	(									\
-		echo 'SMLofNJ.Internals.GC.messages false;';			\
-		echo '#set CM.Control.verbose false;';				\
-		echo '#set CM.Control.warn_obsolete false;';			\
-		echo 'Control.polyEqWarn := false;';				\
-		echo 'val _ = CM.Server.start {cmd = (CommandLine.name (), ["@CMslave"]), name = "server1", pathtrans = NONE, pref = 0};';\
-		echo 'val _ = CM.Server.start {cmd = (CommandLine.name (), ["@CMslave"]), name = "server2", pathtrans = NONE, pref = 0};';\
-		echo 'CM.make "mlton-smlnj.cm";';				\
-		echo 'SMLofNJ.exportFn("$(LIB)/mlton-smlnj",Main.main);'	\
-	) | "$(SMLNJ)"
-
-.PHONY: smlnj-mlton-quad
-smlnj-mlton-quad: $(SOURCES)
-	rm -f control/version.sml
-	$(MAKE) control/version.sml
-	(									\
-		echo 'SMLofNJ.Internals.GC.messages false;';			\
-		echo '#set CM.Control.verbose false;';				\
-		echo '#set CM.Control.warn_obsolete false;';			\
-		echo 'Control.polyEqWarn := false;';				\
-		echo 'val _ = CM.Server.start {cmd = (CommandLine.name (), ["@CMslave"]), name = "server1", pathtrans = NONE, pref = 0};';\
-		echo 'val _ = CM.Server.start {cmd = (CommandLine.name (), ["@CMslave"]), name = "server2", pathtrans = NONE, pref = 0};';\
-		echo 'val _ = CM.Server.start {cmd = (CommandLine.name (), ["@CMslave"]), name = "server3", pathtrans = NONE, pref = 0};';\
-		echo 'val _ = CM.Server.start {cmd = (CommandLine.name (), ["@CMslave"]), name = "server4", pathtrans = NONE, pref = 0};';\
-		echo 'CM.make "mlton-smlnj.cm";';				\
-		echo 'SMLofNJ.exportFn("$(LIB)/mlton-smlnj",Main.main);'	\
-	) | "$(SMLNJ)"
-
 .PHONY: smlnj-whole
 smlnj-whole: $(SOURCES)
 	(									\