[MLton-commit] r7352

[Wesley Terpstra]

Control compression level from Makefile instead of wxs.
=> Can build msi and exe with one pass


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

U   mlton/trunk/package/mingw/Makefile
U   mlton/trunk/package/mingw/mlton.wxs.in

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

Modified: mlton/trunk/package/mingw/Makefile
===================================================================
--- mlton/trunk/package/mingw/Makefile	2009-11-02 21:49:53 UTC (rev 7351)
+++ mlton/trunk/package/mingw/Makefile	2009-11-02 22:43:22 UTC (rev 7352)
@@ -19,11 +19,12 @@
 	cat 7zS.sfx MLton.conf data.7z > $@
 
 data.7z:	MLton.msi
-	7z a data.7z -mx=9 $<
+	rm -f $@
+	7z a $@ -mx9 -mmt $<
 
 .INTERMEDIATE: MLton.msi
 MLton.msi:	mlton.wixobj dirs.wixobj files.wixobj $(PKG_WIXOBJ)
-	light -cultures:en-us -ext WixUIExtension -out $@ $^
+	light -dcl:none -cultures:en-us -ext WixUIExtension -out $@ $^
 MLton-$(VERSION).msi:	mlton.wixobj dirs.wixobj files.wixobj $(PKG_WIXOBJ)
 	light -dcl:high -cultures:en-us -ext WixUIExtension -out $@ $^
 
@@ -36,7 +37,6 @@
 %.exe:		%.sml
 	$(MLTON) $<
 
-.PHONY: mlton.wxs
 mlton.wxs:	mlton.wxs.in guid.exe
 	sed "s/@VERSION@/$(VERSION)/g;s/@WINVERSION@/$(WINVERSION)/g;s/@GUID@/`./guid $(VERSION)`/g" \
 	< $< > $@

Modified: mlton/trunk/package/mingw/mlton.wxs.in
===================================================================
--- mlton/trunk/package/mingw/mlton.wxs.in	2009-11-02 21:49:53 UTC (rev 7351)
+++ mlton/trunk/package/mingw/mlton.wxs.in	2009-11-02 22:43:22 UTC (rev 7352)
@@ -21,7 +21,7 @@
       <RemoveExistingProducts After='InstallFinalize'/>
     </InstallExecuteSequence>
 
-    <Media Id='1' Cabinet='MLton.cab' EmbedCab='yes' CompressionLevel="none" />
+    <Media Id='1' Cabinet='MLton.cab' EmbedCab='yes' />
     <Property Id='DiskPrompt' Value="MLton Installation CD [1]" />
     <Property Id="ARPPRODUCTICON" Value="mlton.ico" />
     <Icon Id="mlton.ico" SourceFile="mlton.ico" />