From: Juho Snellman <jsnell@iki.fi>
Date: Thu, 17 Oct 2013 02:56:46 +0000 (+0200)
Subject: Fix release-related things
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=ecebde418ab9dbd66ef4729c5c04242c57a8c1e6;p=sbcl.git

Fix release-related things

contrib changes need to be reflected in binary-distribution.sh
and documentation building too.
---

diff --git a/binary-distribution.sh b/binary-distribution.sh
index 234cc4f..dea1fc8 100755
--- a/binary-distribution.sh
+++ b/binary-distribution.sh
@@ -10,6 +10,7 @@ set -e
 # switched over to trying to do this the way everyone else does.)
 
 b=${1:?"missing base directory name argument"}
+
 tar -cf $b-binary.tar \
     $b/output/sbcl.core $b/src/runtime/sbcl $b/output/prefix.def \
     $b/BUGS $b/COPYING $b/CREDITS $b/INSTALL $b/NEWS $b/README \
@@ -18,8 +19,10 @@ tar -cf $b-binary.tar \
     $b/pubring.pgp \
     $b/contrib/asdf-module.mk \
     $b/contrib/vanilla-module.mk \
-    `for dir in $b/contrib/*; do
-         if test -d $dir && test -f $dir/test-passed; then
-             find $dir -name CVS -type d -prune -o \! -type d \! -name '.cvsignore' -print
+    `for contrib in $(cd $b/contrib && echo *); do
+         src_dir=$b/contrib/$contrib
+         if test -d $src_dir && test -f $obj_dir/test-passed.test-report; then
+             find $src_dir -name CVS -type d -prune -o \! -type d \! -name '.cvsignore' -print
          fi
-     done`
+     done` \
+    $b/obj/sbcl-home
diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index e82c172..7b80ca9 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -12,8 +12,9 @@ HTMLFILES=sbcl.html asdf.html
 # DOCSTRINGDIR has to end with a slash or you lose (it's passed to
 # Lisp's `pathname' function).
 DOCSTRINGDIR="docstrings/"
-CONTRIBDIR="../../contrib/"
-I_FLAGS=-I $(DOCSTRINGDIR) -I $(CONTRIBDIR)
+CONTRIB_SRC_DIR="../../contrib/"
+CONTRIB_OBJ_DIR="../../obj/asdf-cache/"
+I_FLAGS=-I $(DOCSTRINGDIR) -I $(CONTRIB_SRC_DIR)
 # List of contrib modules that docstring docs will be created for.
 MODULES=':sb-md5 :sb-queue :sb-concurrency :sb-rotate-byte :sb-grovel \
          :sb-sprof :sb-bsd-sockets :sb-cover :sb-posix'
@@ -93,11 +94,11 @@ info: $(INFOFILES)
 # Texinfo docstring snippets
 # Note: assumes contrib module names are the same as the names of
 # directories containing the modules, and that these directories
-# are in $(CONTRIBDIR).
-CONTRIB_FASLS=$(shell find $(shell echo $(MODULES) | sed "s|:|$(CONTRIBDIR)|g") -name '*.fasl')
+# are in $(CONTRIB_OBJ_DIR).
+CONTRIB_FASLS=$(shell find $(shell echo $(MODULES) | sed "s|:|$(CONTRIB_OBJ_DIR)|g") -name '*.fasl')
 docstrings: $(CONTRIB_FASLS) tempfiles-stamp
 	for module in $(shell echo $(MODULES)); do \
-		test -f $(CONTRIBDIR)/`echo $$module | tr -d :`/test-passed \
+		test -f $(CONTRIB_OBJ_DIR)/`echo $$module | tr -d :`/test-passed.test-report \
 		|| { echo "The documented contrib $$module seems \
                            to have failed its tests." && exit 1; } \
 	done
diff --git a/doc/manual/make-tempfiles.sh b/doc/manual/make-tempfiles.sh
index aac4bb1..ec07a3f 100644
--- a/doc/manual/make-tempfiles.sh
+++ b/doc/manual/make-tempfiles.sh
@@ -24,7 +24,7 @@ then
     if [ -f $sbclsystem ] && [ -f $sbclcore ]
     then
         SBCLRUNTIME="$sbclsystem --core $sbclcore"
-        SBCL_HOME=$SBCL_PWD/../../contrib/; export SBCL_HOME
+        SBCL_HOME=$SBCL_PWD/../../obj/sbcl-home/; export SBCL_HOME
         SBCL_BUILDING_CONTRIB="please asdf install your hook"; export SBCL_BUILDING_CONTRIB
     else
         SBCLRUNTIME="`which sbcl`"
diff --git a/tools-for-build/wxs.lisp b/tools-for-build/wxs.lisp
index bcc928e..bfe05b4 100644
--- a/tools-for-build/wxs.lisp
+++ b/tools-for-build/wxs.lisp
@@ -95,7 +95,7 @@
       (free-alien guid))))
 
 (defun list-all-contribs ()
-  (loop for flag in (directory "../contrib/*/test-passed")
+  (loop for flag in (directory "../obj/asdf-cache/*/test-passed.test-report")
         collect (car (last (pathname-directory flag)))))
 
 (defvar *id-char-substitutions* '((#\\ . #\_)
@@ -170,7 +170,7 @@
                 append (collect-components directory))))
 
 (defun collect-contrib-components ()
-  (loop for contrib in (directory "../contrib/*/test-passed")
+  (loop for contrib in (directory "../obj/asdf-cache/*/test-passed.test-report")
         append (collect-components (make-pathname :name nil
                                                   :type nil
                                                   :version nil