projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.4.60: More efficient structure raw slot accessors on x86-64
[sbcl.git]
/
make-target-contrib.sh
diff --git
a/make-target-contrib.sh
b/make-target-contrib.sh
index
899c19a
..
42bd56f
100644
(file)
--- a/
make-target-contrib.sh
+++ b/
make-target-contrib.sh
@@
-21,14
+21,13
@@
export LANG LC_ALL
. ./find-gnumake.sh
find_gnumake
. ./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
-SBCL_HOME=`pwd`/contrib
+. ./sbcl-pwd.sh
+sbcl_pwd
+
+SBCL_HOME=$SBCL_PWD/contrib
export SBCL_HOME
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
SBCL_BUILDING_CONTRIB=1
export SBCL SBCL_BUILDING_CONTRIB
@@
-38,21
+37,30
@@
export SBCL SBCL_BUILDING_CONTRIB
# as SB-RT and SB-GROVEL, but FIXME: there's probably a better
# solution. -- CSR, 2003-05-30
# 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' \) \
+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
-print | xargs rm -f
-mkdir -p contrib/systems
-rm -f contrib/systems/*
-
-for i in contrib/*/*.asd; do
- ln -sf ../../$i contrib/systems/
-done
+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
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
+ # 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
done
# Sometimes people used to see the "No tests failed." output from the last
@@
-64,9
+72,17
@@
do
if $HEADER_HAS_BEEN_PRINTED; then
echo > /dev/null
else
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
HEADER_HAS_BEEN_PRINTED=true
fi
echo " `basename $dir`"
fi
done
+
+if [ $HEADER_HAS_BEEN_PRINTED = true ]; then
+ exit 1
+fi