X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-contrib.sh;h=96ea6102da3c70b096e225b500b47867c27bbec6;hb=cb296ae5a022a5b0f1fd573584301b0d2a9493f9;hp=b8e53ef115c70d7504f76aa4f6ed949a94924ea5;hpb=424a1607654dc2fab254b23aa494a7fb50d4f6e0;p=sbcl.git

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index b8e53ef..96ea610 100644
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # 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 trying to
-# cross-compile the system or if you're doing some kind of
-# troubleshooting.
+# probably want to run it by itself is if you're cross-compiling the
+# system or doing some kind of troubleshooting.
 
 # This software is part of the SBCL system. See the README file for
 # more information.
@@ -14,20 +13,39 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
+. ./find-gnumake.sh
+find_gnumake
+
 # 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
-export SBCL_HOME=`pwd`/contrib
+SBCL_HOME=`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_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB
 
-gnumake=${GNUMAKE:-gmake}
+# 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
+
+find contrib/ \( -name '*.fasl' -o -name 'foo.c' -o -name 'a.out' -o -name 'alien.so' -o -name '*.o' \) \
+  -print | xargs rm -f
+
+mkdir -p contrib/systems
+rm -f contrib/systems/*
+
+for i in contrib/*/*.asd; do
+    ln -sf ../../$i contrib/systems/
+done
 
 for i in contrib/*; do
-    test -d $i || continue;
+    test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    $gnumake -C $i test 
+    test -f $i/test-passed && rm $i/test-passed 
+    $GNUMAKE -C $i test && touch $i/test-passed
 done