[MLton] cvs commit: upgrade to SML/NJ 110.45
Stephen Weeks
sweeks@mlton.org
Thu, 4 Mar 2004 14:36:31 -0800
sweeks 04/03/04 14:36:31
Modified: mlton Makefile
Log:
MAIL upgrade to SML/NJ 110.45
The Makefile now automatically tests for this.
Revision Changes Path
1.88 +11 -7 mlton/mlton/Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/mlton/mlton/mlton/Makefile,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- Makefile 20 Feb 2004 19:16:39 -0000 1.87
+++ Makefile 4 Mar 2004 22:36:31 -0000 1.88
@@ -96,12 +96,18 @@
# Manager (CM) installed. You may need to replace the following with
# 'sml-cm'.
#
-SMLNJ_VERSION = 110.44
+SMLNJ_VERSION = 110.45
SML = sml
+.PHONY: check-nj-version
+check-nj-version:
+ if ! echo | $(SML) | grep -q $(SMLNJ_VERSION); then \
+ echo You must use SML/NJ $(SMLNJ_VERSION); \
+ fi
+
.PHONY: nj-mlton
nj-mlton: $(SOURCES)
- @echo You must use SML/NJ $(SMLNJ_VERSION).
+ $(MAKE) check-nj-version
( \
echo 'SMLofNJ.Internals.GC.messages false;'; \
echo '#set CM.Control.verbose false;'; \
@@ -110,11 +116,10 @@
echo 'CM.make "sources.cm";'; \
echo 'Main.exportNJ ("$(SRC)/basis-library", "$(LIB)/mlton");' \
) | $(SML)
- @echo You must use SML/NJ $(SMLNJ_VERSION).
.PHONY: nj-mlton-dual
nj-mlton-dual: $(SOURCES)
- @echo You must use SML/NJ $(SMLNJ_VERSION).
+ $(MAKE) check-nj-version
( \
echo 'SMLofNJ.Internals.GC.messages false;'; \
echo '#set CM.Control.verbose false;'; \
@@ -125,11 +130,10 @@
echo 'CM.make "sources.cm";'; \
echo 'Main.exportNJ ("$(SRC)/basis-library", "$(LIB)/mlton");' \
) | $(SML)
- @echo You must use SML/NJ $(SMLNJ_VERSION).
.PHONY: nj-whole
nj-whole: $(SOURCES)
- @echo You must use SML/NJ $(SMLNJ_VERSION).
+ $(MAKE) check-nj-version
( \
echo 'SMLofNJ.Internals.GC.messages false;'; \
echo '#set CM.Control.verbose false;'; \
@@ -145,4 +149,4 @@
echo 'end'; \
) >mlton.whole.sml
$(SML) <mlton.whole.sml
- @echo You must use SML/NJ $(SMLNJ_VERSION).
+