Commit 8468bd6d authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

2.26.26: avoid excessive uninterning on ECL.

Change declare ignore to ignorable to make ACL happier.
Remove slot for if-component-dep-fails.
Update some tests and workaround a failure on ecl-bytecodes.
parent 5326ede0
...@@ -28,9 +28,7 @@ doc/asdf.t2d/ ...@@ -28,9 +28,7 @@ doc/asdf.t2d/
LICENSE LICENSE
tmp/ tmp/
*.dribble *.dribble
*.fasl *.fas[bcl]
*.dfsl
*.cfsl
*.fas *.fas
*.lib *.lib
*.[oahcisS] *.[oahcisS]
......
...@@ -7,10 +7,9 @@ sourceDirectory := $(shell pwd) ...@@ -7,10 +7,9 @@ sourceDirectory := $(shell pwd)
ifdef ASDF_TEST_LISPS ifdef ASDF_TEST_LISPS
lisps ?= ${ASDF_TEST_LISPS} lisps ?= ${ASDF_TEST_LISPS}
else else
lisps ?= ccl clisp sbcl ecl cmucl abcl scl allegro lispworks lisps ?= ccl clisp sbcl ecl ecl-bytecodes cmucl abcl scl allegro lispworks
endif endif
## MINOR FAIL: ecl-bytecodes (failure in test-compile-file-failure.script)
## MINOR FAIL: xcl (logical pathname issue in asdf-pathname-test.script) ## MINOR FAIL: xcl (logical pathname issue in asdf-pathname-test.script)
## OCCASIONALLY TESTED BY NOT ME: allegromodern (not in my free demo version) ## OCCASIONALLY TESTED BY NOT ME: allegromodern (not in my free demo version)
## MAJOR FAIL: gclcvs -- COMPILER BUG! Upstream fixed it, but upstream fails to compile. ## MAJOR FAIL: gclcvs -- COMPILER BUG! Upstream fixed it, but upstream fails to compile.
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
:licence "MIT" :licence "MIT"
:description "Another System Definition Facility" :description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems." :long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.26.25" ;; to be automatically updated by bin/bump-revision :version "2.26.26" ;; to be automatically updated by bin/bump-revision
:depends-on () :depends-on ()
:components :components
((:file "asdf"))) ((:file "asdf")))
......
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*- ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.25: Another System Definition Facility. ;;; This is ASDF 2.26.26: Another System Definition Facility.
;;; ;;;
;;; Feedback, bug reports, and patches are all welcome: ;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>. ;;; please mail to <asdf-devel@common-lisp.net>.
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
;; "2.345.6" would be a development version in the official upstream ;; "2.345.6" would be a development version in the official upstream
;; "2.345.0.7" would be your seventh local modification of official release 2.345 ;; "2.345.0.7" would be your seventh local modification of official release 2.345
;; "2.345.6.7" would be your seventh local modification of development version 2.345.6 ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
(asdf-version "2.26.25") (asdf-version "2.26.26")
(existing-asdf (find-class 'component nil)) (existing-asdf (find-class 'component nil))
(existing-version *asdf-version*) (existing-version *asdf-version*)
(already-there (equal asdf-version existing-version))) (already-there (equal asdf-version existing-version)))
...@@ -246,36 +246,31 @@ ...@@ -246,36 +246,31 @@
:unintern :unintern
(#:*asdf-revision* #:around #:asdf-method-combination (#:*asdf-revision* #:around #:asdf-method-combination
#:split #:make-collector #:do-dep #:do-one-dep #:split #:make-collector #:do-dep #:do-one-dep
#:resolve-relative-location-component #:resolve-absolute-location-component
#:traverse-action #:visit-action #:traverse
#:loaded-systems ; makes for annoying SLIME completion #:loaded-systems ; makes for annoying SLIME completion
#:output-files-for-system-and-operation) ; obsolete ASDF-BINARY-LOCATION function #:output-files-for-system-and-operation) ; obsolete ASDF-BINARY-LOCATION function
:export :export
(#:defsystem #:oos #:operate #:find-system #:locate-system #:run-shell-command (#:defsystem #:find-system #:locate-system
#:oos #:operate #:traverse #:perform-plan
#:system-definition-pathname #:with-system-definitions #:system-definition-pathname #:with-system-definitions
#:search-for-system-definition #:find-component #:component-find-path #:search-for-system-definition #:find-component #:component-find-path
#:compile-system #:load-system #:load-systems #:compile-system #:load-system #:load-systems
#:require-system #:test-system #:clear-system #:require-system #:test-system #:clear-system
#:operation #:compile-op #:load-op #:load-source-op #:test-op #:operation #:upward-operation #:downward-operation
#:upward-operation #:downward-operation #:prepare-op #:prepare-source-op #:load-op #:prepare-op #:compile-op #:load-fasl-op
#:parent-component #:child-component #:prepare-source-op #:load-source-op #:test-op
#:feature #:version #:version-satisfies #:feature #:version #:version-satisfies #:upgrade-asdf
#:upgrade-asdf
#:implementation-identifier #:implementation-type #:hostname #:implementation-identifier #:implementation-type #:hostname
#:input-files #:output-files #:output-file #:perform #:input-files #:output-files #:output-file #:perform
#:operation-done-p #:explain #:component-sibling-dependencies #:operation-done-p #:explain #:component-sibling-dependencies
#:component-load-dependencies #:component-load-dependencies #:run-shell-command ; deprecated, do not use
#:precompiled-system #:compiled-file
#:component #:source-file #+ecl #:make-build #+mkcl #:bundle-system
#:c-source-file #:cl-source-file #:java-source-file
#:cl-source-file.cl #:cl-source-file.lsp #:component #:parent-component #:child-component #:system #:module
#:static-file #:source-file #:c-source-file #:java-source-file
#:doc-file #:cl-source-file #:cl-source-file.cl #:cl-source-file.lsp
#:html-file #:static-file #:doc-file #:html-file :text-file
#:text-file
#:source-file-type #:source-file-type
#:module ; components
#:system
#:unix-dso #:unix-dso
#:component-children ; component accessors #:component-children ; component accessors
...@@ -373,8 +368,6 @@ ...@@ -373,8 +368,6 @@
#:system-source-registry #:system-source-registry
#:user-source-registry-directory #:user-source-registry-directory
#:system-source-registry-directory #:system-source-registry-directory
#:load-fasl-op #:precompiled-system #:compiled-file
#+ecl #:make-build #+mkcl #:bundle-system
;; Utilities: please use asdf-utils instead ;; Utilities: please use asdf-utils instead
#| #|
...@@ -504,8 +497,7 @@ or ASDF:LOAD-SOURCE-OP if your fasl loading is somehow broken.") ...@@ -504,8 +497,7 @@ or ASDF:LOAD-SOURCE-OP if your fasl loading is somehow broken.")
((defdef (def* def) ((defdef (def* def)
`(defmacro ,def* (name formals &rest rest) `(defmacro ,def* (name formals &rest rest)
`(progn `(progn
;;#+(or ecl (and gcl (not gcl-pre2.7))) (fmakunbound ',name) #+(or ecl (and gcl (not gcl-pre2.7))) (fmakunbound ',name)
#-gcl-pre2.7 (fmakunbound ',name)
#-gcl ; gcl 2.7.0 notinline functions lose secondary return values :-( #-gcl ; gcl 2.7.0 notinline functions lose secondary return values :-(
,(when (and #+ecl (symbolp name)) ; fails for setf functions on ecl ,(when (and #+ecl (symbolp name)) ; fails for setf functions on ecl
`(declaim (notinline ,name))) `(declaim (notinline ,name)))
...@@ -1367,12 +1359,6 @@ Returns two values: ...@@ -1367,12 +1359,6 @@ Returns two values:
(children-by-name (children-by-name
:reader module-components-by-name ; backwards compatibility :reader module-components-by-name ; backwards compatibility
:accessor component-children-by-name) :accessor component-children-by-name)
;; What to do if we can't satisfy a dependency of one of this module's
;; components. This allows a limited form of conditional processing.
(if-component-dep-fails
:initform :fail
:initarg :if-component-dep-fails
:accessor module-if-component-dep-fails)
(default-component-class (default-component-class
:initform nil :initform nil
:initarg :default-component-class :initarg :default-component-class
...@@ -2113,7 +2099,7 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded. ...@@ -2113,7 +2099,7 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded.
o)) o))
(defmethod find-operation ((operation operation) (sub operation)) (defmethod find-operation ((operation operation) (sub operation))
(declare (ignore operation)) (declare (ignorable operation))
sub) sub)
(defmethod find-operation ((operation operation) (sub symbol)) (defmethod find-operation ((operation operation) (sub symbol))
...@@ -4726,7 +4712,7 @@ with a different configuration, so the configuration would be re-read then." ...@@ -4726,7 +4712,7 @@ with a different configuration, so the configuration would be re-read then."
(declare (ignorable o c)) (declare (ignorable o c))
nil) nil)
(defmethod input-files (o (c compiled-file)) (defmethod input-files (o (c compiled-file))
(declare (ignore o)) (declare (ignorable o))
(load (component-pathname c))) (load (component-pathname c)))
(defmethod perform ((o load-op) (c compiled-file)) (defmethod perform ((o load-op) (c compiled-file))
(declare (ignorable o)) (declare (ignorable o))
......
(eval-when (:compile-toplevel :load-toplevel :execute) (eval-when (:compile-toplevel :load-toplevel :execute)
;; CLISP 2.48 has a bug that makes this test fail. Work around: ;; CLISP 2.48 has a bug that makes this test fail. Work around:
#+clisp (when (eq asdf:*compile-file-failure-behaviour* :error) (error 'asdf:compile-error)) #+(or clisp ecl) (when (and (eq asdf:*compile-file-failure-behaviour* :error)
#+ecl (equal (fasl-type) "fasc"))
(error 'asdf:compile-error :operation "op" :component "comp"))
(warn "Warning.")) (warn "Warning."))
(defsystem test-weakly-depends-on-present (defsystem test-weakly-depends-on-present
:weakly-depends-on (file3-only) :weakly-depends-on (file3-only)
:if-component-dep-fails :ignore
:components ((:file "file1"))) :components ((:file "file1")))
(defsystem test-weakly-depends-on-unpresent (defsystem test-weakly-depends-on-unpresent
:weakly-depends-on (does-not-exist) :weakly-depends-on (does-not-exist)
:if-component-dep-fails :ignore
:components ((:file "file1"))) :components ((:file "file1")))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment