[MLton-commit] r7349

[Wesley Terpstra]

Show users who inspect the package the version we'd like them to see,
ie. 20091102, not the windows version hack 9.11.2.


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

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 19:38:57 UTC (rev 7348)
+++ mlton/trunk/package/mingw/Makefile	2009-11-02 19:42:48 UTC (rev 7349)
@@ -38,7 +38,7 @@
 
 .PHONY: mlton.wxs
 mlton.wxs:	mlton.wxs.in guid.exe
-	sed "s/@VERSION@/$(WINVERSION)/g;s/@GUID@/`./guid $(VERSION)`/g" \
+	sed "s/@VERSION@/$(VERSION)/g;s/@WINVERSION@/$(WINVERSION)/g;s/@GUID@/`./guid $(VERSION)`/g" \
 	< $< > $@
 
 self32.lst:

Modified: mlton/trunk/package/mingw/mlton.wxs.in
===================================================================
--- mlton/trunk/package/mingw/mlton.wxs.in	2009-11-02 19:38:57 UTC (rev 7348)
+++ mlton/trunk/package/mingw/mlton.wxs.in	2009-11-02 19:42:48 UTC (rev 7349)
@@ -2,18 +2,18 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Name='MLton @VERSION@' Id='@GUID@'
     UpgradeCode='C353A6D5-4A30-D7CF-62E2-04D98AF8A864'
-    Language='1033' Codepage='1252' Version='@VERSION@' Manufacturer='MLton.org'>
+    Language='1033' Codepage='1252' Version='@WINVERSION@' Manufacturer='MLton.org'>
 
     <Package Id='*' Keywords='Installer'
-      Description="MLton Installer v at VERSION@"
+      Description="MLton Installer @VERSION@"
       Comments='MLton is an open-source, whole-program, optimizing Standard ML compiler.' Manufacturer='MLton.org'
       InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
     <Upgrade Id='C353A6D5-4A30-D7CF-62E2-04D98AF8A864'>
       <UpgradeVersion OnlyDetect='yes' Property='NEWERFOUND'
-       Minimum='@VERSION@' IncludeMinimum='no' />
+       Minimum='@WINVERSION@' IncludeMinimum='no' />
       <UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND'
-       Maximum='@VERSION@' IncludeMaximum='no' />
+       Maximum='@WINVERSION@' IncludeMaximum='no' />
     </Upgrade>
     <CustomAction Id='NoDowngrade' Error='A newer version of MLton is already installed. If you want to downgrade, remove the newer version manually and try again.' />
     <InstallExecuteSequence>