Commit 040fae9f authored by Robert P. Goldman's avatar Robert P. Goldman Committed by Robert P. Goldman
Browse files

Fix for launchpad bug 1247662.

Ensure that SYSTEM-DEFSYSTEM-DEPENDS-ON never gets SLOT-UNBOUND error.
Also cache DEPENDS-ON and WEAKLY-DEPENDS-ON info from DEFSYSTEM.
parent 08137f4c
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
#:name #:version #:description #:long-description #:author #:maintainer #:licence #:name #:version #:description #:long-description #:author #:maintainer #:licence
#:components-by-name #:components #:components-by-name #:components
#:children #:children-by-name #:default-component-class #:children #:children-by-name #:default-component-class
#:author #:maintainer #:licence #:source-file #:author #:maintainer #:licence #:source-file
;; the following retained for backward compatibility.
#:defsystem-depends-on
#:sideway-dependencies #:if-feature #:in-order-to #:inline-methods #:sideway-dependencies #:if-feature #:in-order-to #:inline-methods
#:relative-pathname #:absolute-pathname #:operation-times #:around-compile #:relative-pathname #:absolute-pathname #:operation-times #:around-compile
#:%encoding #:properties #:component-properties #:parent)) #:%encoding #:properties #:component-properties #:parent))
......
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
(source-file :initform nil :initarg :source-file :accessor system-source-file) (source-file :initform nil :initarg :source-file :accessor system-source-file)
(defsystem-depends-on :reader system-defsystem-depends-on :initarg :defsystem-depends-on (defsystem-depends-on :reader system-defsystem-depends-on :initarg :defsystem-depends-on
:initform nil) :initform nil)
;; these two are specially set in parse-component-form, so have no :INITARGs.
(depends-on :reader system-depends-on :initform nil) (depends-on :reader system-depends-on :initform nil)
(weakly-depends-on :reader system-weakly-depends-on :initform nil) (weakly-depends-on :reader system-weakly-depends-on :initform nil)
)) ))
......
...@@ -93,6 +93,9 @@ ...@@ -93,6 +93,9 @@
asdf/component:components asdf/component:components
asdf/component:components-by-name asdf/component:components-by-name
asdf/component:default-component-class asdf/component:default-component-class
;; the following is here only for backward compatibility; should be in
;; asdf/system. [2014/02/20:rpg]
asdf/component:defsystem-depends-on
asdf/component:description asdf/component:description
asdf/component:%encoding asdf/component:%encoding
asdf/component:if-feature asdf/component:if-feature
...@@ -124,7 +127,10 @@ ...@@ -124,7 +127,10 @@
asdf/system:bug-tracker asdf/system:bug-tracker
asdf/system:build-pathname asdf/system:build-pathname
asdf/system:system-defsystem-depends-on asdf/system:system-defsystem-depends-on
<<<<<<< HEAD
asdf/system:system-depends-on asdf/system:system-depends-on
=======
>>>>>>> Fix for launchpad bug 1247662.
asdf/system:system-weakly-depends-on asdf/system:system-weakly-depends-on
asdf/system:entry-point asdf/system:entry-point
asdf/system:homepage asdf/system:homepage
......
Supports Markdown
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