From: David Lichteblau <david@lichteblau.com>
Date: Mon, 26 Nov 2012 16:38:34 +0000 (+0100)
Subject: More Windows Installer tweaks
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=e6132565e6dc12d8ec7f05224ffb422107e3ef4e;p=sbcl.git

More Windows Installer tweaks

  - look for version 3.7 or 3.5 automatically

  - make the "start menu" shortcut optional

  - suppress "test-output" directory
---

diff --git a/make-windows-installer.sh b/make-windows-installer.sh
index a7e4886..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\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
diff --git a/tools-for-build/wxs.lisp b/tools-for-build/wxs.lisp
index baf16a1..bcc928e 100644
--- a/tools-for-build/wxs.lisp
+++ b/tools-for-build/wxs.lisp
@@ -117,7 +117,7 @@
 (defun file-id (pathname)
   (id (format nil "File_~A" (enough-namestring pathname *sbcl-source-root*))))
 
-(defparameter *ignored-directories* '("CVS" ".svn"))
+(defparameter *ignored-directories* '("CVS" ".svn" "test-output"))
 
 (defparameter *pathname-type-abbrevs*
   '(("lisp" . "lsp")
@@ -275,9 +275,10 @@
                   "ConfigurableDirectory" "INSTALLDIR"
                   "Level" 1)
        ("ComponentRef" ("Id" "SBCL_Base"))
-       ("ComponentRef" ("Id" "SBCL_Shortcut"))
        ("Feature" ("Id" "Contrib" "Level" 1 "Title" "Contributed Modules")
                   ,@(ref-all-components))
+       ("Feature" ("Id" "Shortcut" "Level" 1 "Title" "Add Start Menu Shortcut")
+                  ("ComponentRef" ("Id" "SBCL_Shortcut")))
        ("Feature" ("Id" "SetPath" "Level" 1 "Title" "Set Environment Variable: PATH")
                   ("ComponentRef" ("Id" "SBCL_SetPATH")))
        ;; SetHome is still enabled by default (level 1), because SBCL