0.9.13.52: Windows installer tweaks

  * Name the installer sbcl-<version>.msi, not sbcl.msi
  * De-impress Xach
     <Xach> i was impressed by ID
     <Xach> it reminded me of gentle DOOM

diff --git a/make-windows-installer.sh b/make-windows-installer.sh
index ccfa5f0..7c89e5f 100644 (file)
--- a/make-windows-installer.sh
+++ b/make-windows-installer.sh
@@ -23,9 +23,14 @@ cd output
   --eval '(progn 
             (write-rtf (read-text "../COPYING") "License.rtf")
             (write-wxs "sbcl.wxs")
+            (with-open-file (f "version.txt" 
+                               :direction :output
+                               :if-exists :supersede)
+             (write-line (lisp-implementation-version) f))
             (quit))'
 
 "$WIX_PATH/candle" sbcl.wxs
 "$WIX_PATH/light" sbcl.wixobj "$WIX_PATH/wixui.wixlib" \
    -loc "$WIX_PATH/WixUI_en-us.wxl" \
-   -out sbcl.msi
+   -out sbcl-`cat version.txt`.msi
+

diff --git a/tools-for-build/wxs.lisp b/tools-for-build/wxs.lisp
index b6d4faa..10fbd8e 100644 (file)
--- a/tools-for-build/wxs.lisp
+++ b/tools-for-build/wxs.lisp
@@ -78,13 +78,18 @@
   (loop for flag in (directory "../contrib/*/test-passed")
         collect (car (last (pathname-directory flag)))))
 
+(defvar *id-char-substitutions* '((#\\ . #\_)
+                                  (#\/ . #\_)
+                                  (#\: . #\.)
+                                  (#\- . #\.)))
+
 (defun id (string)
   ;; Mangle a string till it can be used as an Id. A-Z, a-z, 0-9, and
   ;; _ are ok, nothing else is.
-  (nsubstitute #\_ #\-
-               (nsubstitute #\. #\:
-                            (nsubstitute #\. #\/
-                                         (substitute #\. #\\ string)))))
+  (map 'string (lambda (c)
+                 (or (cdr (assoc c *id-char-substitutions*))
+                     c))
+       string))
 
 (defun directory-id (name)
   (id (format nil "Directory_~A" (enough-namestring name))))

diff --git a/version.lisp-expr b/version.lisp-expr
index b8dff87..d839676 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.13.51"
+"0.9.13.52"