[MLton-commit] r6801

[Wesley Terpstra]

Need to include GMP in the installer.
Add a custom license file.
Split the debug libraries out (they're huge!)
----------------------------------------------------------------------

A   mlton/trunk/package/mingw/License.rtf
U   mlton/trunk/package/mingw/Makefile
U   mlton/trunk/package/mingw/mlton.wxs

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

Added: mlton/trunk/package/mingw/License.rtf
===================================================================
(Binary files differ)


Property changes on: mlton/trunk/package/mingw/License.rtf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: mlton/trunk/package/mingw/Makefile
===================================================================
--- mlton/trunk/package/mingw/Makefile	2008-08-24 23:46:33 UTC (rev 6800)
+++ mlton/trunk/package/mingw/Makefile	2008-08-25 00:47:27 UTC (rev 6801)
@@ -7,15 +7,16 @@
 MINGW_BINUTILS=$(TARDIR)/binutils-2.17.50-20060824-1.tar.gz
 MINGW_GCC=$(TARDIR)/gcc-core-3.4.5-20060117-1.tar.gz
 MINGW_MSYS=$(TARDIR)/msysCORE-1.0.11-2007.01.19-1.tar.bz2
+MINGW_GMP=$(TARDIR)/gmp-static-mingw-4.1.tar.gz
 
-MINGW_WXS=mingw-runtime.wxs w32api.wxs binutils.wxs gcc.wxs msys.wxs
+MINGW_WXS=mingw-runtime.wxs w32api.wxs binutils.wxs gcc.wxs gmp.wxs msys.wxs
 MINGW_WIXOBJ=$(patsubst %.wxs,%.wixobj,$(MINGW_WXS))
 
-mlton.msi:	mlton.wixobj self.wixobj filesys.wixobj $(MINGW_WIXOBJ)
+mlton.msi:	mlton.wixobj self.wixobj dbg.wixobj filesys.wixobj $(MINGW_WIXOBJ)
 	$(WIX)/light -out $@ $^ $(WIX)/wixui.wixlib -loc $(WIX)/WixUI_en-us.wxl
 
 clean:
-	rm -rf staging mlton.msi *.wixobj *.exe $(MINGW_WXS) self.wxs filesys.wxs
+	rm -rf staging mlton.msi *.wixobj *.exe $(MINGW_WXS) self.wxs dbg.wxs filesys.wxs
 
 %.wixobj:	%.wxs
 	$(WIX)/candle $<
@@ -55,9 +56,20 @@
 	cp msys.bat staging
 	mv $@.tmp $@
 
+gmp.wxs:		$(MINGW_GMP) self.wxs
+	tar tzf $< | sed 's@^gmp/@@' | ./files2wix-feature "MinGW" "GMP" "GnuMP" "A library for arbitrary precision arithmetic." > $@.tmp
+	tar xzf $(MINGW_GMP)
+	cp -a gmp/* staging
+	rm -rf gmp
+	mv $@.tmp $@
+
 self.wxs:	files2wix-feature.exe
 	rm -rf staging
 	make -C ../.. PREFIX= install
 	mv ../../install staging
-	cd staging; find * -type f | ../files2wix-feature "Complete" "MLton" "MLton" "A whole-program optimizing Standard ML compiler." > ../$@.tmp
+	cd staging; find * -type f ! -name *-gdb.a | ../files2wix-feature "Complete" "MLton" "MLton" "A whole-program optimizing Standard ML compiler." > ../$@.tmp
 	mv $@.tmp $@
+
+dbg.wxs:	self.wxs
+	cd staging; find * -type f -name *-gdb.a | ../files2wix-feature "Complete" "Debug" "MLton Debug" "The MLton runtime libraries with included debug information." > ../$@.tmp
+	mv $@.tmp $@

Modified: mlton/trunk/package/mingw/mlton.wxs
===================================================================
--- mlton/trunk/package/mingw/mlton.wxs	2008-08-24 23:46:33 UTC (rev 6800)
+++ mlton/trunk/package/mingw/mlton.wxs	2008-08-25 00:47:27 UTC (rev 6801)
@@ -24,16 +24,18 @@
       <Directory Id="DesktopFolder" Name="Desktop" />
     </Directory>
 
-    <Feature Id='Complete' Title='MLton' Description='A complete SML and C toolchain.'
+    <Feature Id='Complete' Title='MLton/MinGW' Description='A complete SML and C toolchain.'
       Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
       <Feature Id='MinGW' Title='MinGW' Description='The minimalist GNU for Windows C compiler toolchain.' Level='1'>
         <FeatureRef Id='Runtime'/>
         <FeatureRef Id='W32API'/>
         <FeatureRef Id='Binutils'/>
         <FeatureRef Id='GCC'/>
+        <FeatureRef Id='GMP'/>
         <FeatureRef Id='MSYS'/>
       </Feature>
       <FeatureRef Id='MLton'/>
+      <FeatureRef Id='Debug'/>
     </Feature>
 
     <UIRef Id="WixUI_Mondo" />