X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-contrib.sh;h=c1711119a900e654614a038dc4ed26aad7a2c5a0;hb=b75bc9ddf359ae9dcf25faf2f60f35aeb488e853;hp=9823d3708eac5fda0163ac59b9c4113d4069f436;hpb=b06500a7381d0d5a789034ab00e3f708e62805b1;p=sbcl.git

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 9823d37..c171111 100644
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -14,21 +14,27 @@ set -e
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
+echo //entering make-target-contrib.sh
+
 LANG=C
 LC_ALL=C
-export LANG LC_ALL
+CC=${CC:-gcc}
+export CC LANG LC_ALL
+
+# Load our build configuration
+. output/build-config
 
-. ./find-gnumake.sh
-find_gnumake
+. ./sbcl-pwd.sh
+sbcl_pwd
 
-# 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
+SBCL_HOME="$SBCL_PWD/contrib"
 export SBCL_HOME
+if [ "$OSTYPE" = "cygwin" ] ; then
+    SBCL_PWD=`echo $SBCL_PWD | sed s/\ /\\\\\\\\\ /g`
+fi
 
-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 \
+--lose-on-corruption --disable-debugger --no-sysinit --no-userinit"
 SBCL_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB
 
@@ -50,11 +56,30 @@ find contrib/ \( -name '*.fasl' -o \
                  -name '*.O' \) \
   -print | xargs rm -f
 
-for i in contrib/*; do
+find output -name 'building-contrib.*' -print | xargs rm -f
+
+# Ignore all source registries.
+CL_SOURCE_REGISTRY='(:source-registry :ignore-inherited-configuration)'
+export CL_SOURCE_REGISTRY
+
+if [ -z "$*" ]; then
+    contribs_to_build=contrib/*
+else
+    for name in $*; do
+        contribs_to_build="contrib/$name $contribs_to_build"
+    done
+fi
+
+for i in $contribs_to_build; 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
+    # 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
@@ -66,9 +91,17 @@ do
       if $HEADER_HAS_BEEN_PRINTED; then
           echo > /dev/null
       else
-          echo "Failed contribs:"
+          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