1.0.0.4: tweak windows installer builder and html-distribution.sh

 * Use an appropriate base to ENOUGH-NAMESTRING in the wxs.lisp.
 * Name the html tarball with -documentation-html.tar suffix.
 * Add SUPPORT file to HTML tarball.

diff --git a/html-distribution.sh b/html-distribution.sh
index b52ae9a..6a2bb58 100644 (file)
--- a/html-distribution.sh
+++ b/html-distribution.sh
@@ -2,11 +2,11 @@
 set -e
 
 # Create a distribution containing the HTML versions of system
-# documentation. (make-doc.sh needs to be run first, in order to
+# documentation. (cd doc/manual && make needs to be run first, in order to
 # compile the doc sources into HTML.)
 
 b=${1:?missing base directory name argument}
-tar cf $b-html.tar \
+tar cf $b-documentation-html.tar \
     `find $b -name '*.htm*'` \
-    $b/COPYING $b/CREDITS $b/README \
+    $b/COPYING $b/CREDITS $b/README $b/SUPPORT \
     $b/pubring.pgp

diff --git a/tools-for-build/wxs.lisp b/tools-for-build/wxs.lisp
index 10fbd8e..705e12e 100644 (file)
--- a/tools-for-build/wxs.lisp
+++ b/tools-for-build/wxs.lisp
@@ -13,6 +13,11 @@
 
 (defvar *indent-level* 0)
 
+(defvar *sbcl-source-root*
+  (truename 
+   (merge-pathnames (make-pathname :directory (list :relative :up))
+                    (make-pathname :name nil :type nil :defaults *load-truename*))))
+
 (defun print-xml (sexp &optional (stream *standard-output*))
   (destructuring-bind (tag &optional attributes &body children) sexp
     (when attributes (assert (evenp (length attributes))))
@@ -92,7 +97,7 @@
        string))
 
 (defun directory-id (name)
-  (id (format nil "Directory_~A" (enough-namestring name))))
+  (id (format nil "Directory_~A" (enough-namestring name *sbcl-source-root*))))
 
 (defun directory-names (pathname)
   (let ((name (car (last (pathname-directory pathname)))))
@@ -102,7 +107,7 @@
         (list "Name" name))))
 
 (defun file-id (pathname)
-  (id (format nil "File_~A" (enough-namestring pathname))))
+  (id (format nil "File_~A" (enough-namestring pathname *sbcl-source-root*))))
 
 (defparameter *ignored-directories* '("CVS" ".svn"))
 
@@ -134,7 +139,7 @@
 (defparameter *components* nil)
 
 (defun component-id (pathname)
-  (let ((id (id (format nil "Contrib_~A" (enough-namestring pathname)))))
+  (let ((id (id (format nil "Contrib_~A" (enough-namestring pathname *sbcl-source-root*)))))
     (push id *components*)
     id))
 

diff --git a/version.lisp-expr b/version.lisp-expr
index 40e453c..8a78bdb 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".)
-"1.0.0.3"
+"1.0.0.4"