common-lisp/sbcl.sbcl
1
0
Fork 0
mirror of git://git.code.sf.net/p/sbcl/sbcl synced 2026-09-09 23:16:41 -04:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Simplify install.sh

Browse source 
Don't look at asdf-cache to decide whether each contrib was built.
Just copy the entirety of contrib/ in one "cp" command.
This commit is contained in:
Douglas Katzman 2022-10-03 12:44:45 -04:00
parent a2394a8a89
commit 98d114f26a
4 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/Makefile
View file

@ -21,11 +21,9 @@ sb-simple-streams.fasl: sb-posix.fasl sb-bsd-sockets.fasl
sb-grovel.fasl: asdf.fasl # for building the module, not for our build
# Notes:
# 1. Not sure if we still need mkdir asdf-cache. Nothing goes there.
# 2. Invoking $(MAKE) for nested make eliminates a warning about jobserver mode.
# 3. This could be made to 'tee' into output/building-contrib as it used to,
# 1. Invoking $(MAKE) for nested make eliminates a warning about jobserver mode.
# 2. This could be made to 'tee' into output/{something} as it used to,
# but it would be more Lispy if not elegant to have 'make-contrib.lisp' bind
# *ERROR-OUTPUT* to a broadcast stream of SYS:*STDERR* and a file stream.
%.fasl:
mkdir -p ../obj/asdf-cache/$(basename $(@F))
$(MAKE) MODULE_REQUIRES="$^" -C $(basename $(@F)) </dev/null 2>&1

3
contrib/asdf-module.mk
View file

@ -31,6 +31,3 @@ all: $(FASL)
$(FASL):: # this produces $(ASD) as a side-effect
$(SBCL) --load ../make-contrib.lisp "$(SYSTEM)" $(MODULE_REQUIRES)
install:
cp $(FASL) $(ASD) "$(BUILD_ROOT)$(INSTALL_DIR)"

17
install.sh
View file

@ -123,21 +123,8 @@ done
# installing contrib
# See make-target-contrib.sh for this variable.
SBCL_TOP="../../"
SBCL="$SBCL_TOP/src/runtime/sbcl --noinform --core $SBCL_TOP/output/sbcl.core --no-userinit --no-sysinit --disable-debugger"
export SBCL SBCL_TOP
. ./find-gnumake.sh
find_gnumake
for i in `cd obj/asdf-cache ; echo *`; do
test -d obj/asdf-cache/$i && test -f obj/sbcl-home/contrib/$i.fasl || continue;
INSTALL_DIR="$SBCL_HOME/contrib/"
export INSTALL_DIR
ensure_dirs "$BUILD_ROOT$INSTALL_DIR" && $GNUMAKE -C contrib/$i install < /dev/null
done
ensure_dirs "$BUILD_ROOT$SBCL_HOME/contrib/"
cp obj/sbcl-home/contrib/* "$BUILD_ROOT$SBCL_HOME/contrib/"
echo
echo "SBCL has been installed:"

3
make-target-contrib.sh
View file

@ -56,11 +56,8 @@ SBCL="$SBCL_TOP/src/runtime/sbcl --noinform --core $SBCL_TOP/output/sbcl.core \
if [ -z "$DONT_CLEAN_SBCL_CONTRIB" ] ; then
rm -rf obj/from-xc/contrib/
rm -fr obj/sbcl-home/contrib/
rm -fr obj/asdf-cache/
fi
find output -name 'building-contrib.*' -print | xargs rm -f
set -e # exit with failure if any $GNUMAKE fails
# Ignore all source registries.
if [ -z "$*" ]; then