X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-windows-installer.sh;h=3b10048a6ad2927c254d63ec439cce86e525a231;hb=HEAD;hp=dc05a22ae407a2f114e076e8aa1512aabb7e58ec;hpb=f0da2f63aa0b4e6d4dbf884854a4bf2dfdd01fc0;p=sbcl.git

diff --git a/make-windows-installer.sh b/make-windows-installer.sh
index dc05a22..3b10048 100644
--- a/make-windows-installer.sh
+++ b/make-windows-installer.sh
@@ -9,7 +9,14 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-WIX_PATH="${WIX_PATH:-$PROGRAMFILES\WiX}"
+if test -n "$WIX_PATH"; then
+    :
+elif test -d "$PROGRAMFILES/WiX Toolset v3.7"; then
+    WIX_PATH="$PROGRAMFILES/WiX Toolset v3.7/bin"
+elif test -d "$PROGRAMFILES/Windows Installer XML v3.5"; then
+    WIX_PATH="$PROGRAMFILES/Windows Installer XML v3.5/bin"
+fi
+echo "using $WIX_PATH"
 
 . ./sbcl-pwd.sh
 sbcl_pwd
@@ -20,17 +27,16 @@ cd output
   --disable-debugger --no-sysinit --no-userinit \
   --load ../tools-for-build/rtf.lisp \
   --load ../tools-for-build/wxs.lisp \
-  --eval '(progn 
+  --eval '(progn
             (write-rtf (read-text "../COPYING") "License.rtf")
             (write-wxs "sbcl.wxs")
-            (with-open-file (f "version.txt" 
+            (with-open-file (f "version.txt"
                                :direction :output
                                :if-exists :supersede)
              (write-line (lisp-implementation-version) f))
             (exit))'
 
 "$WIX_PATH/candle" sbcl.wxs
-"$WIX_PATH/light" sbcl.wixobj "$WIX_PATH/wixui.wixlib" \
-   -loc "$WIX_PATH/WixUI_en-us.wxl" \
+"$WIX_PATH/light" sbcl.wixobj \
+   -ext "$WIX_PATH/WixUIExtension.dll" -cultures:en-us \
    -out sbcl-`cat version.txt`.msi
-