X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make.sh;h=2a9a9b6843f4261ba49f7e6ff6635b6d429aa51a;hb=3273f8edb6c40ed9e046c807b0f1d1ff42bb9a35;hp=080b45a0a2bcdb5477f3771d9508f10e4329ccab;hpb=5385b537ad1e6622d482df28810217dbf7329b32;p=sbcl.git

diff --git a/make.sh b/make.sh
index 080b45a..2a9a9b6 100755
--- a/make.sh
+++ b/make.sh
@@ -51,35 +51,19 @@
 # require a second pass, just testing at build-the-cross-compiler time
 # 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
+export LANG
 
-export GNUMAKE
-echo //GNUMAKE=\"$GNUMAKE\"
+build_started=`date`
+echo "//starting build: $build_started"
 
+SBCL_XC_HOST="${1:-sbcl --disable-debugger}"
+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
@@ -113,17 +97,51 @@ 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   || exit 1
+time sh make-target-1.sh || exit 1
+time sh make-host-2.sh   || exit 1
+time sh make-target-2.sh || exit 1
+time 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 thing that's all that is. So...
+# DEFTEST in contrib self-tests and think that's all that is. So...
+FLAG=true
+for dir in contrib/*
+do
+  if [ -d "$dir" -a -e "$dir/Makefile" -a ! -e "$dir/test-passed" ]; then
+      if $FLAG; then
+	  echo > /dev/null
+      else
+	  echo "Failed contribs:"
+	  FLAG=false
+      fi
+      echo "  `basename $dir`"
+  fi
+done
+
+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. If you would like
-echo run more extensive tests on the new SBCL, you can try run-tests.sh.
+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 "  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"