[MLton-commit] r7073

[Matthew Fluet]

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

U   mlton/trunk/mlton/Makefile
D   mlton/trunk/mlton/main/export-smlnj.sml
U   mlton/trunk/mlton/main/sources.cm

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

Modified: mlton/trunk/mlton/Makefile
===================================================================
--- mlton/trunk/mlton/Makefile	2009-04-08 12:33:25 UTC (rev 7072)
+++ mlton/trunk/mlton/Makefile	2009-04-08 12:33:34 UTC (rev 7073)
@@ -114,7 +114,7 @@
 		echo '#set CM.Control.warn_obsolete false;';			\
 		echo 'Control.polyEqWarn := false;';				\
 		echo 'CM.make "mlton-smlnj.cm";';				\
-		echo 'ExportSMLNJ.exportSMLNJ("$(LIB)/mlton-smlnj");'		\
+		echo 'SMLofNJ.exportFn("$(LIB)/mlton-smlnj",Main.main);'	\
 	) | "$(SMLNJ)"
 
 .PHONY: smlnj-mlton-dual
@@ -127,7 +127,7 @@
 		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 'ExportSMLNJ.exportSMLNJ("$(LIB)/mlton-smlnj");'		\
+		echo 'SMLofNJ.exportFn("$(LIB)/mlton-smlnj",Main.main);'	\
 	) | "$(SMLNJ)"
 
 .PHONY: smlnj-mlton-quad
@@ -142,7 +142,7 @@
 		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 'ExportSMLNJ.exportSMLNJ("$(LIB)/mlton-smlnj");'		\
+		echo 'SMLofNJ.exportFn("$(LIB)/mlton-smlnj",Main.main);'	\
 	) | "$(SMLNJ)"
 
 .PHONY: smlnj-whole
@@ -163,7 +163,7 @@
 			grep -v 'mlton-stubs-for-smlnj' |			\
 			grep -v 'mlton-stubs' | xargs cat;	 		\
 		echo 'in';							\
-		echo 'ExportSMLNJ.exportSMLNJ("$(LIB)/mlton-smlnj");'		\
+		echo 'SMLofNJ.exportFn("$(LIB)/mlton-smlnj",Main.main);'	\
 		echo 'end';							\
 	) >mlton.whole.sml
 	"$(SMLNJ)" <mlton.whole.sml

Deleted: mlton/trunk/mlton/main/export-smlnj.sml
===================================================================
--- mlton/trunk/mlton/main/export-smlnj.sml	2009-04-08 12:33:25 UTC (rev 7072)
+++ mlton/trunk/mlton/main/export-smlnj.sml	2009-04-08 12:33:34 UTC (rev 7073)
@@ -1,11 +0,0 @@
-(* Copyright (C) 2009 Matthew Fluet.
- *
- * MLton is released under a BSD-style license.
- * See the file MLton-LICENSE for details.
- *)
-
-structure ExportSMLNJ =
-   struct
-      fun exportSMLNJ (file: string): unit =
-         SMLofNJ.exportFn (file, Main.main)
-   end

Modified: mlton/trunk/mlton/main/sources.cm
===================================================================
--- mlton/trunk/mlton/main/sources.cm	2009-04-08 12:33:25 UTC (rev 7072)
+++ mlton/trunk/mlton/main/sources.cm	2009-04-08 12:33:34 UTC (rev 7073)
@@ -11,7 +11,6 @@
 
 structure Main
 #if (defined (SMLNJ_VERSION))
-structure ExportSMLNJ
 #else
 structure ExportMLton
 #endif
@@ -41,7 +40,6 @@
 main.fun
 main.sml
 #if (defined (SMLNJ_VERSION))
-export-smlnj.sml
 #else
 export-mlton.sml
 #endif