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

Adapt to the new version of WiX.

Browse source 
Version 3.9 is no longer compatible with what was generated.

Patch by Mick Charles Beaver.
This commit is contained in:
Stas Boukarev 2015-04-10 20:08:33 +03:00
parent 881c95a99d
commit 59853ffe27
2 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
make-windows-installer.sh
View file

@ -9,14 +9,7 @@
# provided with absolutely no warranty. See the COPYING and CREDITS
# files for more information.
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"
WIX_PATH=$WIX/bin
. ./sbcl-pwd.sh
sbcl_pwd

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

@ -142,7 +142,8 @@
"Id" ,(directory-id root))
("Component" ("Id" ,(component-id root)
"Guid" ,(make-guid)
"DiskId" 1)
"DiskId" 1
#+x86-64 "Win64" #+x86-64 "yes")
,@(loop for file in (directory
(make-pathname :name :wild :type :wild :defaults root))
when (or (pathname-name file) (pathname-type file))
@ -209,18 +210,17 @@
("Directory" ("Id" "TARGETDIR"
"Name" "SourceDir")
("Directory" ("Id" "ProgramMenuFolder")
("Component" ("Id" "SBCL_Shortcut"
"Guid" ,(make-guid))
("Shortcut" ("Id" "sbcl.lnk"
"Name" ,(application-name)
"Target" "[INSTALLDIR]sbcl.exe"
"Arguments" "--core \"[#sbcl.core]\""))
("RegistryValue" ("Root" "HKCU"
"Key" ,(application-name)
"Name" "installed"
"Type" "integer"
"Value" "1"
"KeyPath" "yes"))))
("Directory" ("Id" "ProgramMenuDir"
"Name" ,(application-name))
("Component" ("Id" "ProgramMenuDir"
"Guid" ,(make-guid))
("RemoveFolder" ("Id" "ProgramMenuDir"
"On" "uninstall"))
("RegistryValue" ("Root" "HKCU"
"Key" "Software\[Manufacturer]\[ProductName]"
"Type" "string"
"Value" ""
"KeyPath" "yes")))))
("Directory" ("Id" #-x86-64 "ProgramFilesFolder" #+x86-64 "ProgramFiles64Folder"
"Name" "PFiles")
("Directory" ("Id" "BaseFolder"
@ -230,7 +230,9 @@
("Directory" ("Id" "INSTALLDIR")
("Component" ("Id" "SBCL_SetHOME"
"Guid" ,(make-guid)
"DiskId" 1)
"DiskId" 1
#+x86-64 "Win64" #+x86-64 "yes")
("CreateFolder")
("Environment" ("Id" "Env_SBCL_HOME"
"System" "yes"
"Action" "set"
@ -240,7 +242,9 @@
("Component" ("Id" "SBCL_SetPATH"
"Guid" ,(make-guid)
"DiskId" 1)
"DiskId" 1
#+x86-64 "Win64" #+x86-64 "yes")
("CreateFolder")
("Environment" ("Id" "Env_PATH"
"System" "yes"
"Action" "set"
@ -249,7 +253,8 @@
"Value" "[INSTALLDIR]")))
("Component" ("Id" "SBCL_Base"
"Guid" ,(make-guid)
"DiskId" 1)
"DiskId" 1
#+x86-64 "Win64" #+x86-64 "yes")
;; If we want to associate files with SBCL, this
;; is how it's done -- but doing this by default
;; and without asking the user for permission Is
@ -257,20 +262,25 @@
;; how to make WiX ask for permission for this...
;; ,(make-extension "fasl" "application/x-lisp-fasl")
;; ,(make-extension "lisp" "text/x-lisp-source")
("File" ("Name" "sbcl.exe"
"Source" "../src/runtime/sbcl.exe"))
("File" ("Name" "sbcl.core"
"Source" "sbcl.core")))
"Source" "sbcl.core"))
("File" ("Name" "sbcl.exe"
"Source" "../src/runtime/sbcl.exe"
"KeyPath" "yes")
("Shortcut" ("Id" "sbcl.lnk"
"Advertise" "yes"
"Name" ,(application-name)
"Directory" "ProgramMenuDir"
"Arguments" "--core \"[#sbcl.core]\""))))
,@(collect-contrib-components))))))
("Feature" ("Id" "Minimal"
"Title" "SBCL Executable"
"ConfigurableDirectory" "INSTALLDIR"
"Level" 1)
("ComponentRef" ("Id" "SBCL_Base"))
("ComponentRef" ("Id" "ProgramMenuDir"))
("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