[MLton-commit] r7350

[Wesley Terpstra]

Support md5sum in different locations.


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

U   mlton/trunk/package/mingw/Makefile
U   mlton/trunk/package/mingw/files2wix.sml

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

Modified: mlton/trunk/package/mingw/Makefile
===================================================================
--- mlton/trunk/package/mingw/Makefile	2009-11-02 19:42:48 UTC (rev 7349)
+++ mlton/trunk/package/mingw/Makefile	2009-11-02 19:53:58 UTC (rev 7350)
@@ -90,5 +90,5 @@
 	cd staging; find * -type d | ../dirs2wix > ../$@.tmp
 	mv $@.tmp $@
 files.wxs:	files2wix.exe $(PKG_LST)
-	cat $(PKG_LST) | sort | uniq | ./files2wix > ./$@.tmp
+	cat $(PKG_LST) | sort | uniq | ./files2wix `which md5sum` > ./$@.tmp
 	mv $@.tmp $@

Modified: mlton/trunk/package/mingw/files2wix.sml
===================================================================
--- mlton/trunk/package/mingw/files2wix.sml	2009-11-02 19:42:48 UTC (rev 7349)
+++ mlton/trunk/package/mingw/files2wix.sml	2009-11-02 19:53:58 UTC (rev 7350)
@@ -1,3 +1,9 @@
+val md5sum =
+   case CommandLine.arguments () of
+      [md5sum] => md5sum
+    | _ => (print "Specify path to md5sum executable\n"; 
+            OS.Process.exit OS.Process.failure)
+
 val prefix = "\
    \<?xml version='1.0' encoding='windows-1252'?>\n\
    \<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\n\
@@ -36,7 +42,7 @@
          MLton.Process.create {
             args = ["staging/" ^ path],
             env = NONE,
-            path = "md5sum",
+            path = md5sum,
             stdin  = MLton.Process.Param.null,
             stderr = MLton.Process.Param.self,
             stdout = MLton.Process.Param.pipe