summaryrefslogtreecommitdiff
path: root/make-windows-installer.sh
diff options
context:
space:
mode:
authorDavid Lichteblau <david@lichteblau.com>2012-11-26 17:38:34 +0100
committerDavid Lichteblau <david@lichteblau.com>2012-12-05 17:34:29 +0100
commite6132565e6dc12d8ec7f05224ffb422107e3ef4e (patch)
tree17d5e91506daec3d20f25d875a668276f133e837 /make-windows-installer.sh
parent359c7f002c22bdfebffb87e2a4c23bab7da4b393 (diff)
More Windows Installer tweaks
- look for version 3.7 or 3.5 automatically - make the "start menu" shortcut optional - suppress "test-output" directory
Diffstat (limited to 'make-windows-installer.sh')
-rw-r--r--make-windows-installer.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/make-windows-installer.sh b/make-windows-installer.sh
index a7e488646..3b10048a6 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\Windows Installer XML v3.5\bin}"
+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