X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-contrib.sh;h=22fe7e59fc12805d68758d4d9687e9494eacb216;hb=e0aff99a73d836da0dad4602e5559595fbe5ba5c;hp=806670f0e2a6fb4fe1319828e0d8f48a49741f21;hpb=9ee93905283a787b9966a91af1ab19f3c31a4065;p=sbcl.git

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 806670f..22fe7e5 100644
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -14,20 +14,26 @@ 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
 
-. ./find-gnumake.sh
-find_gnumake
+# Load our build configuration
+. output/build-config
 
 . ./sbcl-pwd.sh
 sbcl_pwd
 
-SBCL_HOME=$SBCL_PWD/contrib
+SBCL_HOME="$SBCL_PWD/contrib"
 export SBCL_HOME
+if [ "$OSTYPE" = "cygwin" ] ; then
+    SBCL_PWD=`echo $SBCL_PWD | sed s/\ /\\\\\\\\\ /g`
+fi
 
-SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core --disable-debugger --no-sysinit --no-userinit"
+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
 
@@ -51,7 +57,19 @@ find contrib/ \( -name '*.fasl' -o \
 
 find output -name 'building-contrib.*' -print | xargs rm -f
 
-for i in contrib/*; do
+# 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
@@ -74,7 +92,7 @@ do
       else
           cat <<EOF
 
-WARNING! Some of the contrib modules did not build succesfully or pass
+WARNING! Some of the contrib modules did not build successfully or pass
 their self-tests. Failed contribs:"
 EOF
           HEADER_HAS_BEEN_PRINTED=true
@@ -83,6 +101,6 @@ EOF
   fi
 done
 
-if [ $HEADER_HAS_BEEN_PRINTED == true ]; then
+if [ $HEADER_HAS_BEEN_PRINTED = true ]; then
   exit 1
 fi