X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make.sh;h=58907b8ceeb7f78a1eb3fb04b10bc53f0ad5782d;hb=02a50d510572990c2b836e37ec1c0b23dac41b1a;hp=df101ca494e70fee51b2a15e061838be548d3adf;hpb=920649d1915aa94b4af894b7284c3a52b11cdf0f;p=sbcl.git

diff --git a/make.sh b/make.sh
index df101ca..58907b8 100755
--- a/make.sh
+++ b/make.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # "When we build software, it's a good idea to have a reliable method
 # for getting an executable from it. We want any two reconstructions
@@ -32,7 +33,7 @@
 #                 endlessly for a programmer to help it out with input
 #                 on *DEBUG-IO*
 #   "lisp -batch" to use an existing CMU CL binary as a cross-compilation host
-#   "lisp -noinit -batch" 
+#   "lisp -noinit -batch"
 #                 to use an existing CMU CL binary as a cross-compilation host
 #                 when you have weird things in your .cmucl-init file
 #   "openmcl --batch"
@@ -49,42 +50,30 @@
 # optimizations (especially specializable arrays) that it doesn't
 # know how to implement how in a portable way. (Or maybe that wouldn't
 # require a second pass, just testing at build-the-cross-compiler time
-# whether the cross-compilation host returns suitable values from 
+# whether the cross-compilation host returns suitable values from
 # UPGRADED-ARRAY-ELEMENT-TYPE?)
-# FIXME: --noprogrammer was deprecated in sbcl-0.7.5, replaced by 
-# --disable-debugger. We still use the old form here because the
-# change was not preannounced, and it would be rude to make our new
-# version of SBCL unbootstrappable by immediately prior versions.
-# But in a year or so the --noprogrammer here can change to
-# --disable-debugger (and the deprecated --noprogrammer support can
-# go away completely).
-SBCL_XC_HOST="${1:-sbcl --noprogrammer}"
-export SBCL_XC_HOST
-echo //SBCL_XC_HOST=\"$SBCL_XC_HOST\"
 
-# the GNU dialect of "make" -- easier to find or port it than to
-# try to figure out how to port to the local dialect...
-if [ "$GNUMAKE" != "" ] ; then
-  # The user is evidently trying to tell us something.
-  GNUMAKE="$GNUMAKE"
-elif [ -x "`which gmake`" ] ; then
-  # "gmake" is the preferred name in *BSD.
-  GNUMAKE=gmake
-elif [ "GNU Make" = "`make -v | head -n 1 | cut -b 0-8`" ]; then
-  GNUMAKE=make
-else
-  echo "GNU Make not found. Try setting the environment variable GNUMAKE."
-  exit 1
-fi
+LANG=C
+LC_ALL=C
+export LANG LC_ALL
 
-export GNUMAKE
-echo //GNUMAKE=\"$GNUMAKE\"
+build_started=`date`
+echo "//starting build: $build_started"
 
+SBCL_XC_HOST="${1:-sbcl --disable-debugger --userinit /dev/null --sysinit /dev/null}"
+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
+sh make-config.sh
+
+# Enforce the source policy for no bogus whitespace
+tools-for-build/canonicalize-whitespace
 
 # 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
@@ -98,7 +87,7 @@ sh make-config.sh || exit 1
 #     identify the target architecture).
 #   On the host system:
 #     SBCL_XC_HOST=<whatever> sh make-host-1.sh
-#   Copy src/runtime/genesis/*.h from the host system to the target 
+#   Copy src/runtime/genesis/*.h from the host system to the target
 #     system.
 #   On the target system:
 #     sh make-target-1.sh
@@ -113,18 +102,34 @@ sh make-config.sh || exit 1
 # 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.
-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
+time sh make-host-1.sh
+time sh make-target-1.sh
+time sh make-host-2.sh
+time sh make-target-2.sh
+time sh make-target-contrib.sh
 
-# Sometimes people used to see the "No tests failed." output from the last
-# DEFTEST in contrib self-tests and thing 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 (out of $NCONTRIBS)"
+echo "contributed modules. If you would like to run more extensive tests on"
+echo "the new SBCL, you can try:"
 echo
-echo The build seems to have finished successfully. If you would like
-echo run 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)."
+echo "  cd tests && sh ./run-tests.sh"
+echo
+echo "  (All tests should pass on x86/Linux, x86/FreeBSD4, and ppc/Darwin. On"
+echo "  other platforms some failures are currently expected; patches welcome"
+echo "  as always.)"
+echo
+echo "To build documentation:"
+echo
+echo "  cd doc/manual && make"
+echo
+echo "To install SBCL (more information in INSTALL):"
+echo
+echo "  sh install.sh"
 
-date
+build_finished=`date`
+echo
+echo "//build started:  $build_started"
+echo "//build finished: $build_finished"