[MLton-commit] r7013

[Ville Laurikari]

Added dlfcn-win32 in the package, so "-link-opt -ldl" can be used on
Windows to get dlopen() and friends.  Also updated some other package
contents to more recent versions.

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

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

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

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

Modified: mlton/trunk/package/mingw/Makefile
===================================================================
--- mlton/trunk/package/mingw/Makefile	2009-01-15 17:04:05 UTC (rev 7012)
+++ mlton/trunk/package/mingw/Makefile	2009-01-16 09:20:34 UTC (rev 7013)
@@ -2,7 +2,7 @@
 TARDIR=/c/DOKUME~1/terpstra/Desktop/MinGW
 MLTON=../../build/bin/mlton
 
-MINGW_WXS=runtime.wxs w32api.wxs binutils.wxs gcc.wxs gmp.wxs msys.wxs gdb.wxs
+MINGW_WXS=runtime.wxs w32api.wxs binutils.wxs gcc.wxs gmp.wxs msys.wxs gdb.wxs dlfcn.wxs
 MINGW_WIXOBJ=$(patsubst %.wxs,%.wixobj,$(MINGW_WXS))
 
 MLton.msi:	mlton.wixobj self.wixobj dbg.wixobj filesys.wixobj $(MINGW_WIXOBJ)
@@ -19,7 +19,7 @@
 
 self.wxs:	files2wix-component.exe
 	rm -rf staging
-	make -C ../.. PREFIX= install
+	$(MAKE) -C ../.. PREFIX= install
 	mv ../../install staging
 	cd staging; find * -type f ! -name *-gdb.a | ../files2wix-component MLton > ../$@.tmp
 	mv $@.tmp $@
@@ -30,16 +30,17 @@
 
 # This has to happen after everything else is unpacked
 filesys.wxs:	dirs2wix-filesys.exe $(MINGW_WIXOBJ) self.wixobj
-	cd staging; find * -type d | ../dirs2wix-filesys > ../$@.tmp 
+	cd staging; find * -type d | ../dirs2wix-filesys > ../$@.tmp
 	mv $@.tmp $@
 
-runtime.wxs:	$(TARDIR)/mingwrt-3.15-mingw32-dev.tar.gz self.wxs
-w32api.wxs:		$(TARDIR)/w32api-3.12-mingw32-dev.tar.gz self.wxs
-binutils.wxs:	$(TARDIR)/binutils-2.18.50-20080109-2-coffgen.tar.gz self.wxs
-gcc.wxs:		$(TARDIR)/gcc-core-3.4.5-20060117-3.tar.gz self.wxs
-msys.wxs:		$(TARDIR)/msysCORE-1.0.11-20080826.tar.gz self.wxs
-gdb.wxs:		$(TARDIR)/gdb-6.8-mingw-3.tar.gz self.wxs
-gmp.wxs:		$(TARDIR)/mingw-gmp-4.2.3-1.tar.gz self.wxs
+runtime.wxs:	$(TARDIR)/mingwrt-3.15.1-mingw32-dev.tar.gz self.wxs
+w32api.wxs:	$(TARDIR)/w32api-3.12-mingw32-dev.tar.gz self.wxs
+binutils.wxs:	$(TARDIR)/binutils-20080624-coffgen.tar.gz self.wxs
+gcc.wxs:	$(TARDIR)/gcc-core-3.4.5-20060117-3.tar.gz self.wxs
+msys.wxs:	$(TARDIR)/msysCORE-1.0.11-20080826.tar.gz self.wxs
+gdb.wxs:	$(TARDIR)/gdb-6.8-mingw-3.tar.gz self.wxs
+gmp.wxs:	$(TARDIR)/mingw-gmp-4.2.4-1.tar.gz self.wxs
+dlfcn.wxs:	$(TARDIR)/dlfcn-win32-shared-r11.tar.gz self.wxs
 
 %.wxs:
 	tar --exclude postinstall -tzf $< | ./files2wix-component $(*F) > $@.tmp

Modified: mlton/trunk/package/mingw/mlton.wxs
===================================================================
--- mlton/trunk/package/mingw/mlton.wxs	2009-01-15 17:04:05 UTC (rev 7012)
+++ mlton/trunk/package/mingw/mlton.wxs	2009-01-16 09:20:34 UTC (rev 7013)
@@ -86,6 +86,9 @@
     <Feature Id='GMP' Title='GMP' Description='An arbitrary precision integer artihmetic library.' Level='1' ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'>
       <ComponentGroupRef Id='component.gmp' />
     </Feature>
+    <Feature Id='dlfcn' Title='dlfcn-win32' Description='An implementation of the POSIX dynamic linking loader API for Windows.' Level='1' ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'>
+      <ComponentGroupRef Id='component.dlfcn' />
+    </Feature>
     <Feature Id='MinGW' Title='MinGW' Description='The minimalist GNU for Windows C compiler toolchain.' Level='1' ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'>
       <Feature Id='Runtime' Title='Runtime' Description='An assortment of thin wrappers that provide POSIX-like functionality on a windows platform.' Level='1' AllowAdvertise='no'>
         <ComponentGroupRef Id='component.runtime' />