[MLton-commit] r7360

[Wesley Terpstra]

We need to change the config file to reference the consistent msi name.


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

D   mlton/trunk/package/mingw/MLton.conf
A   mlton/trunk/package/mingw/MLton.conf.in
U   mlton/trunk/package/mingw/Makefile

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

Deleted: mlton/trunk/package/mingw/MLton.conf
===================================================================
--- mlton/trunk/package/mingw/MLton.conf	2009-11-03 13:56:11 UTC (rev 7359)
+++ mlton/trunk/package/mingw/MLton.conf	2009-11-03 14:24:40 UTC (rev 7360)
@@ -1,3 +0,0 @@
-;!@Install@!UTF-8!
-ExecuteFile="MLton.msi"
-;!@InstallEnd@!

Copied: mlton/trunk/package/mingw/MLton.conf.in (from rev 7353, mlton/trunk/package/mingw/MLton.conf)
===================================================================
--- mlton/trunk/package/mingw/MLton.conf	2009-11-02 23:05:23 UTC (rev 7353)
+++ mlton/trunk/package/mingw/MLton.conf.in	2009-11-03 14:24:40 UTC (rev 7360)
@@ -0,0 +1,3 @@
+;!@Install@!UTF-8!
+ExecuteFile="MLton- at VERSION@.msi"
+;!@InstallEnd@!


Property changes on: mlton/trunk/package/mingw/MLton.conf.in
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: mlton/trunk/package/mingw/Makefile
===================================================================
--- mlton/trunk/package/mingw/Makefile	2009-11-03 13:56:11 UTC (rev 7359)
+++ mlton/trunk/package/mingw/Makefile	2009-11-03 14:24:40 UTC (rev 7360)
@@ -15,8 +15,8 @@
 
 all:	MLton-$(VERSION).exe MLton-$(VERSION).msi
 
-MLton-$(VERSION).exe:	data.7z
-	cat 7zS.sfx MLton.conf data.7z > $@
+MLton-$(VERSION).exe:	7zS.sfx MLton.conf data.7z
+	cat $^ > $@
 
 data.7z:	staging/MLton-$(VERSION).msi
 	rm -f $@
@@ -42,9 +42,13 @@
 %.exe:		%.sml
 	$(MLTON) $<
 
+# Cannot use a pattern rule b/c %.wxs already exists.
 mlton.wxs:	mlton.wxs.in guid.exe
 	sed "s/@VERSION@/$(VERSION)/g;s/@WINVERSION@/$(WINVERSION)/g" < $< | \
 	sed "s/@GUID1@/`./guid $(VERSION).1`/g;s/@GUID2@/`./guid $(VERSION).2`/g" > $@
+MLton.conf:	MLton.conf.in guid.exe
+	sed "s/@VERSION@/$(VERSION)/g;s/@WINVERSION@/$(WINVERSION)/g" < $< | \
+	sed "s/@GUID1@/`./guid $(VERSION).1`/g;s/@GUID2@/`./guid $(VERSION).2`/g" > $@
 
 self32.lst:
 	rm -rf staging