X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make.sh;h=4de59151a637538631b860d9ca5282f9694bb430;hb=582503547d172f95aaf118311f09fe6828a6ea72;hp=500f56f74b6ad47d14bd37894d1fbd701b86d73d;hpb=cd2c70c8b5d4dcc62b968f5a9bedd3c9c8698e82;p=sbcl.git

diff --git a/make.sh b/make.sh
index 500f56f..4de5915 100755
--- a/make.sh
+++ b/make.sh
@@ -37,6 +37,8 @@
 #                 when you have weird things in your .cmucl-init file
 #   "openmcl --batch"
 #                 to use an OpenMCL binary as a cross-compilation host
+#   "clisp"
+#                 to use a CLISP binary as a cross-compilation host
 #
 # FIXME: Make a more sophisticated command line parser, probably
 # accepting "sh make.sh --xc-host foolisp" instead of the
@@ -60,15 +62,14 @@ SBCL_XC_HOST="${1:-sbcl --noprogrammer}"
 export SBCL_XC_HOST
 echo //SBCL_XC_HOST=\"$SBCL_XC_HOST\"
 
+. ./find-gnumake.sh
+find_gnumake
+
 # If you're cross-compiling, you should probably just walk through the
 # make-config.sh script by hand doing the right thing on both the host
 # and target machines.
 sh make-config.sh || exit 1
 
-# Make a unique ID for this build (to discourage people from
-# mismatching sbcl and *.core files).
-echo '"'`hostname -s`-`whoami`-`date +%F-%H-%M-%S`'"' > output/build-id.tmp
-
 # The make-host-*.sh scripts are run on the cross-compilation host,
 # and the make-target-*.sh scripts are run on the target machine. In
 # ordinary compilation, we just do these phases consecutively on the
@@ -81,7 +82,8 @@ echo '"'`hostname -s`-`whoami`-`date +%F-%H-%M-%S`'"' > output/build-id.tmp
 #     identify the target architecture).
 #   On the host system:
 #     SBCL_XC_HOST=<whatever> sh make-host-1.sh
-#   Copy src/runtime/sbcl.h from the host system to the target system.
+#   Copy src/runtime/genesis/*.h from the host system to the target 
+#     system.
 #   On the target system:
 #     sh make-target-1.sh
 #   Copy src/runtime/sbcl.nm and output/stuff-groveled-from-headers.lisp
@@ -90,7 +92,8 @@ echo '"'`hostname -s`-`whoami`-`date +%F-%H-%M-%S`'"' > output/build-id.tmp
 #     SBCL_XC_HOST=<whatever> sh make-host-2.sh
 #   Copy output/cold-sbcl.core from the host system to the target system.
 #   On the target system:
-#     sh make-host-2.sh
+#     sh make-target-2.sh
+#     sh make-target-contrib.sh
 # Or, if you can set up the files somewhere shared (with NFS, AFS, or
 # whatever) between the host machine and the target machine, the basic
 # procedure above should still work, but you can skip the "copy" steps.
@@ -98,4 +101,18 @@ sh make-host-1.sh   || exit 1
 sh make-target-1.sh || exit 1
 sh make-host-2.sh   || exit 1
 sh make-target-2.sh || exit 1
+sh make-target-contrib.sh || exit 1
+
+# Sometimes people used to see the "No tests failed." output from the last
+# DEFTEST in contrib self-tests and think that's all that is. So...
+NCONTRIBS=`find contrib -name Makefile -print | wc -l`
+NPASSED=`find contrib -name test-passed -print | wc -l`
+
+echo
+echo "The build seems to have finished successfully, including $NPASSED"
+echo "(out of $NCONTRIBS) contributed modules.  If you would like to run" 
+echo "more extensive tests on the new SBCL, you can try"
+echo "  cd tests && sh ./run-tests.sh"
+echo "(but expect some failures on non-x86 platforms)."
+
 date