Merge branch 'k11-release-prep'

developers/Holmakefile

@@ -1,18 +1,14 @@
 OPTIONS = NO_OVERLAY
-EXTRA_CLEANS = mosml-comparelogs comparelogs generateBuildSummary $($(ML_SYSNAME)_gbsdep)
+EXTRA_CLEANS = comparelogs generateBuildSummary
 MLTON_SRCS = mlton-srcs/Binarymap.sml mlton-srcs/Listsort.sml comparelogs.mlb
 
-mosml-comparelogs : mosmlTextIO.ui comparelogs.sml
-	$(MOSMLC) -o $@ -toplevel mosmlTextIO.ui comparelogs.sml
-
-mosmlTextIO.ui mosmlTextIO.uo: mosmlTextIO.sml
-	$(MOSMLC) -toplevel $<
+.PHONY: all
+all: comparelogs generateBuildSummary
 
 ifdef POLY
 
 comparelogs: poly-comparelogs.ML comparelogs.sml
-	poly < $<
-	gcc -o $@ comparelogs.o $(POLY_LDFLAGS)
+	$(POLYC) $< -o $@
 
 else
 
@@ -21,10 +17,10 @@ comparelogs: comparelogs.uo
 
 endif
 
-poly_gbsdep = generateBuildSummary.o
+poly_gbsdep = poly-gbs.ML generateBuildSummary.sml
 mosml_gbsdep = mosmlgbs.uo generateBuildSummary.uo
 
-poly_gbscomm = gcc -o $@ $< $(POLY_LDFLAGS)
+poly_gbscomm = $(POLYC) -o $@ $<
 mosml_gbscomm = $(MOSMLC) -o $@ $<
 
 

developers/poly-gbs.ML

@@ -1,3 +1,2 @@
 use "generateBuildSummary.sml";
-
-val _ = PolyML.export ("generateBuildSummary", generateBuildSummary.main)
+val main = generateBuildSummary.main

help/src-sml/poly-Doc2Html.ML

@@ -18,6 +18,4 @@ val _ = useB "ParseDoc";
 val _ = useB "../../sigobj/Systeml";
 val _ = use "Doc2Html.sml";
 
-val _ = PolyML.shareCommonData Doc2Html.main;
-val _ = PolyML.export ("Doc2Html", Doc2Html.main);
-
+val main = Doc2Html.main

help/src-sml/poly-Doc2Tex.ML

@@ -17,6 +17,4 @@ val _ = useB "Symbolic";
 val _ = useB "ParseDoc";
 val _ = use "Doc2Tex.sml";
 
-val _ = PolyML.shareCommonData Doc2Tex.main;
-val _ = PolyML.export ("Doc2Tex", Doc2Tex.main);
-
+val main = Doc2Tex.main;

help/src-sml/poly-Doc2Txt.ML

@@ -18,6 +18,4 @@ val _ = useB "ParseDoc";
 val _ = useB "../../sigobj/Systeml";
 val _ = use "Doc2Txt.sml";
 
-val _ = PolyML.shareCommonData Doc2Txt.main;
-val _ = PolyML.export ("Doc2Txt", Doc2Txt.main);
-
+val main = Doc2Txt.main;

help/src-sml/poly-makebase.ML

@@ -1,6 +1,3 @@
-val _ = PolyML.Compiler.prompt1:="";
-val _ = PolyML.Compiler.prompt2:="";
-val _ = PolyML.print_depth 0;
 val _ = use "../../tools-poly/poly/Binarymap.sig";
 val _ = use "../../tools-poly/poly/Binarymap.sml";
 val _ = use "../../tools-poly/poly/Binaryset.sig";
@@ -47,6 +44,4 @@ val _ = useB "../../sigobj/Systeml";
 
 val _ = use "makebase.sml";
 
-val _ = PolyML.shareCommonData makebase.main;
-val _ = PolyML.export ("makebase", makebase.main);
-
+val main = makebase.main

tools/buildutils.sml

@@ -719,14 +719,10 @@ fun Poly_compilehelp() = let
 in
   system_ps (fullPath [HOLDIR, "tools", "mllex", "mllex.exe"] ^ " Lexer.lex");
   system_ps (fullPath [HOLDIR, "tools", "mlyacc", "src", "mlyacc.exe"] ^ " Parser.grm");
-  system_ps (POLY ^ " < poly-makebase.ML");
-  link "makebase.exe" "makebase.o";
-  system_ps (POLY ^ " < poly-Doc2Html.ML");
-  link "Doc2Html.exe" "Doc2Html.o";
-  system_ps (POLY ^ " < poly-Doc2Txt.ML");
-  link "Doc2Txt.exe" "Doc2Txt.o";
-  system_ps (POLY ^ " < poly-Doc2Tex.ML");
-  link "Doc2Tex.exe" "Doc2Tex.o"
+  system_ps (POLYC ^ " poly-makebase.ML -o makebase.exe");
+  system_ps (POLYC ^ " poly-Doc2Html.ML -o Doc2Html.exe");
+  system_ps (POLYC ^ " poly-Doc2Txt.ML -o Doc2Txt.exe");
+  system_ps (POLYC ^ " poly-Doc2Tex.ML -o Doc2Tex.exe")
 end
 
 val HOLMAKE = fullPath [HOLDIR, "bin/Holmake"]
@@ -761,7 +757,7 @@ fun build_help graph =
      val _ = OS.FileSys.chDir dir
 
      (* builds the documentation tools called below *)
-     val _ = if ML_SYSNAME = "poly" then Poly_compilehelp()
+     val _ = if ML_SYSNAME = "poly" then ignore (Poly_compilehelp())
              else if ML_SYSNAME = "mosml" then mosml_compilehelp()
              else raise Fail "Bogus ML_SYSNAME"