diff --git a/asdf.asd b/asdf.asd index 9fc7993754565cfc542e7a0e67ffaefcd660b276..dc9d72c34ca161447fea1ebf9b9fafa9ff8af33b 100644 --- a/asdf.asd +++ b/asdf.asd @@ -12,7 +12,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." - :version "2.011.4" + :version "2.011.5" ;;:version #.(asdf:asdf-version) ; how do we make that the *described* ASDF's version rather than the *previously loaded* ASDF's version? :depends-on () :components diff --git a/asdf.lisp b/asdf.lisp index 6c55f18c6da4a815ef4b681afcbb71f16d761884..fd123679df2b23a39289465a9b51bbc3f3237d23 100644 --- a/asdf.lisp +++ b/asdf.lisp @@ -78,7 +78,7 @@ ;; "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.6.7" would be your seventh local modification of development version 2.345.6 - (asdf-version "2.011.4") + (asdf-version "2.011.5") (existing-asdf (fboundp 'find-system)) (existing-version *asdf-version*) (already-there (equal asdf-version existing-version))) @@ -870,8 +870,12 @@ processed in order by OPERATE.")) (asdf-message "~&~@<; ~@; Updating ~A for ASDF ~A~@:>~%" m ,(asdf-version))) (when (member 'components-by-name added) (compute-module-components-by-name m)) - (when (and (typep m 'system) (member 'source-file added)) - (%set-system-source-file (probe-asd (component-name m) (component-pathname m)) m)))))) + (when (typep m 'system) + (when (member 'source-file added) + (%set-system-source-file + (probe-asd (component-name m) (component-pathname m)) m) + (when (equal (component-name m) "asdf") + (setf (component-version m) *asdf-version*)))))))) ;;;; ------------------------------------------------------------------------- ;;;; Classes, Conditions @@ -1367,7 +1371,8 @@ Going forward, we recommend new users should be using the source-registry. (throw 'find-system system)))) (defun* sysdef-find-asdf (name) - (find-system-fallback name "asdf")) ;; :version *asdf-version* wouldn't be updated when ASDF is updated. + ;; Bug: :version *asdf-version* won't be updated when ASDF is updated. + (find-system-fallback name "asdf" :version *asdf-version*)) ;;;; -------------------------------------------------------------------------