X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-contrib.sh;h=42bd56f19030f0b913f59d900ddb8b353d2ac9e3;hb=17532463fa19f2fc2aba53b65c32e200a27ccd6a;hp=98526b3729fb7f378a1a116e233876a439295a04;hpb=df679ed627975948b1cee190f4d79c397588c43e;p=sbcl.git

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 98526b3..42bd56f 100644
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # This is a script to be run as part of make.sh. The only time you'd
 # probably want to run it by itself is if you're cross-compiling the
@@ -13,27 +14,75 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-# usually SBCL_HOME refers to the installed root of SBCL, not the
-# build directory.  Right now, however, where there are dependencies
-# between contrib packages, we want the _uninstalled_ versions to be
-# found
-SBCL_HOME=`pwd`/contrib
+LANG=C
+LC_ALL=C
+export LANG LC_ALL
+
+. ./find-gnumake.sh
+find_gnumake
+
+. ./sbcl-pwd.sh
+sbcl_pwd
+
+SBCL_HOME=$SBCL_PWD/contrib
 export SBCL_HOME
 
-SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit /dev/null --sysinit /dev/null --disable-debugger"
+SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core --disable-debugger --no-sysinit --no-userinit"
 SBCL_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB
 
-mkdir -p contrib/systems
-rm -f contrib/systems/*
+# deleting things here lets us not worry about interaction with stale
+# fasls.  This is not good, but is better than :FORCE on each asdf
+# operation, because that causes multiple builds of base systems such
+# as SB-RT and SB-GROVEL, but FIXME: there's probably a better
+# solution.  -- CSR, 2003-05-30
 
-for i in contrib/*/*.asd; do
-    ln -sf ../../$i contrib/systems/
-done
+find contrib/ \( -name '*.fasl' -o \
+                 -name '*.FASL' -o \
+                 -name 'foo.c' -o \
+                 -name 'FOO.C' -o \
+                 -name 'a.out' -o \
+                 -name 'A.OUT' -o \
+                 -name 'alien.so' -o \
+                 -name 'ALIEN.SO' -o \
+                 -name '*.o' -o \
+                 -name '*.O' \) \
+  -print | xargs rm -f
+
+find output -name 'building-contrib.*' -print | xargs rm -f
 
 for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    test -f $i/test-passed && rm $i/test-passed 
-    $GNUMAKE -C $i test && touch $i/test-passed
+    test -f $i/test-passed && rm $i/test-passed
+    # hack to get exit codes right.
+    if $GNUMAKE -C $i test 2>&1 && touch $i/test-passed ; then
+	:
+    else
+	exit $?
+    fi | tee output/building-contrib.`basename $i` 
 done
+
+# 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...
+HEADER_HAS_BEEN_PRINTED=false
+for dir in contrib/*
+do
+  if [ -d "$dir" -a -f "$dir/Makefile" -a ! -f "$dir/test-passed" ]; then
+      if $HEADER_HAS_BEEN_PRINTED; then
+          echo > /dev/null
+      else
+          cat <<EOF
+
+WARNING! Some of the contrib modules did not build successfully or pass
+their self-tests. Failed contribs:"
+EOF
+          HEADER_HAS_BEEN_PRINTED=true
+      fi
+      echo "  `basename $dir`"
+  fi
+done
+
+if [ $HEADER_HAS_BEEN_PRINTED = true ]; then
+  exit 1
+fi