X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tools-for-build%2Fwxs.lisp;h=137479981d4bdc34882c9a1a4c568e1b01d92f73;hb=d07e355f50300d64b282cb9c71fa88441c0b9a3d;hp=705e12e9978467653810525541f3e9e20a7a42fa;hpb=1405cbc1daaa7897c90571c29651a2aa38954a0d;p=sbcl.git diff --git a/tools-for-build/wxs.lisp b/tools-for-build/wxs.lisp index 705e12e..1374799 100644 --- a/tools-for-build/wxs.lisp +++ b/tools-for-build/wxs.lisp @@ -14,7 +14,7 @@ (defvar *indent-level* 0) (defvar *sbcl-source-root* - (truename + (truename (merge-pathnames (make-pathname :directory (list :relative :up)) (make-pathname :name nil :type nil :defaults *load-truename*)))) @@ -116,7 +116,8 @@ ("fasl" . "fas") ("SBCL" . "txt") ; README.SBCL -> README.txt ("texinfo" . "tfo") - ("lisp-temp" . "lmp"))) + ("lisp-temp" . "lmp") + ("html" . "htm"))) (defun file-names (pathname) (if (or (< 8 (length (pathname-name pathname))) @@ -232,8 +233,13 @@ "Name" "PATH" "Part" "first" "Value" "[INSTALLDIR]")) - ,(make-extension "fasl" "application/x-lisp-fasl") - ,(make-extension "lisp" "text/x-lisp-source") + ;; 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 + ;; Bad. Before this is enabled we need to figure out + ;; how to make WiX ask for permission for this... + ;; ,(make-extension "fasl" "application/x-lisp-fasl") + ;; ,(make-extension "lisp" "text/x-lisp-source") ("File" ("Id" "sbcl.exe" "Name" "sbcl.exe" "Source" "../src/runtime/sbcl.exe")