common-lisp/sbcl.sbcl
1
0
Fork 0
mirror of git://git.code.sf.net/p/sbcl/sbcl synced 2026-09-10 07:26:40 -04:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

More Windows Installer tweaks

Browse source 
- look for version 3.7 or 3.5 automatically

  - make the "start menu" shortcut optional

  - suppress "test-output" directory
This commit is contained in:
David Lichteblau 2012-11-26 17:38:34 +01:00
parent 359c7f002c
commit e6132565e6
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
make-windows-installer.sh
View file

@ -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

5
tools-for-build/wxs.lisp
View file

@ -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