From: Christophe Rhodes Date: Fri, 30 May 2003 11:26:58 +0000 (+0000) Subject: 0.8.0.20: X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=0735cc5deb957d9439177ac1de603043d2f6c7d7;p=sbcl.git 0.8.0.20: Minor contrib infrastructure frob: ... don't use :force t to ensure building, because firstly it's hideously expensive in time, as we have to build base systems several times; secondly, it won't work if the semantics change to not propagate the FORCE value to depended systems; and thirdly it doesn't work anyway in the presence of our current TEST-OP implementation. Delete suspicious files (including *.fasl under contrib/) at the start of make-target-contrib.sh instead. ... cvsignore contrib/systems --- diff --git a/contrib/.cvsignore b/contrib/.cvsignore new file mode 100644 index 0000000..e0b8fd9 --- /dev/null +++ b/contrib/.cvsignore @@ -0,0 +1 @@ +systems diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk index 8ae4fa6..cdfd9d6 100644 --- a/contrib/asdf-module.mk +++ b/contrib/asdf-module.mk @@ -5,7 +5,7 @@ all: $(MAKE) -C ../asdf $(SBCL) --eval '(load "../asdf/asdf")' \ --eval "(setf asdf::*central-registry* '((MERGE-PATHNAMES \"systems/\" (TRUENAME (SB-EXT:POSIX-GETENV \"SBCL_HOME\")))))" \ - --eval "(asdf:operate 'asdf:load-op :$(SYSTEM) :force t)" \ + --eval "(asdf:operate 'asdf:load-op :$(SYSTEM))" \ --eval "(quit)" test: all diff --git a/make-target-contrib.sh b/make-target-contrib.sh index 98526b3..2af8c5f 100644 --- a/make-target-contrib.sh +++ b/make-target-contrib.sh @@ -24,6 +24,15 @@ SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit SBCL_BUILDING_CONTRIB=1 export SBCL SBCL_BUILDING_CONTRIB +# 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' \) \ + -print | xargs rm -f + mkdir -p contrib/systems rm -f contrib/systems/* diff --git a/version.lisp-expr b/version.lisp-expr index 225ebae..51d64c1 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.0.19" +"0.8.0.20"