Skip to content
Snippets Groups Projects
Commit 6f520a1e authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

2.26.115: more fixes to version access. Now works with POIU 1.29.6.

parent d8508de1
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,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.114" ;; to be automatically updated by bin/bump-revision :version "2.26.115" ;; to be automatically updated by bin/bump-revision
:depends-on () :depends-on ()
:components ((:module "build" :components ((:file "asdf")))) :components ((:module "build" :components ((:file "asdf"))))
:in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op generate-asdf)))) :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op generate-asdf))))
......
...@@ -136,12 +136,11 @@ ...@@ -136,12 +136,11 @@
(setf component (apply 'make-instance (class-for-type parent type) args))) (setf component (apply 'make-instance (class-for-type parent type) args)))
(component-pathname component) ; eagerly compute the absolute pathname (component-pathname component) ; eagerly compute the absolute pathname
(let ((sysdir (system-source-directory (component-system component)))) ;; requires the previous (let ((sysdir (system-source-directory (component-system component)))) ;; requires the previous
(when versionp (setf version (normalize-version version sysdir)))
(setf version (normalize-version version sysdir)) (when (and versionp (not (parse-version version nil)))
(unless (parse-version version nil) (warn (compatfmt "~@<Invalid version ~S for component ~S~@[ of ~S~]~@:>")
(warn (compatfmt "~@<Invalid version ~S for component ~S~@[ of ~S~]~@:>") version name parent))
version name parent)) (setf (component-version component) version)
(setf (component-version component) version)))
(when (typep component 'parent-component) (when (typep component 'parent-component)
(setf (component-children component) (setf (component-children component)
(loop (loop
......
;; -*- 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.114: Another System Definition Facility. ;;; This is ASDF 2.26.115: 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>.
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,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.114") (asdf-version "2.26.115")
(existing-asdf (find-class (find-symbol* :component :asdf nil) nil)) (existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
(existing-version *asdf-version*) (existing-version *asdf-version*)
(already-there (equal asdf-version existing-version))) (already-there (equal asdf-version existing-version)))
......
...@@ -267,7 +267,7 @@ As a degenerate case, the PATH may be an atom of a single such accessor ...@@ -267,7 +267,7 @@ As a degenerate case, the PATH may be an atom of a single such accessor
instead of a list." instead of a list."
(flet ((access (object accessor) (flet ((access (object accessor)
(etypecase accessor (etypecase accessor
(integer (elt object path)) (integer (elt object accessor))
((or function symbol) (funcall accessor object)) ((or function symbol) (funcall accessor object))
(cons (funcall (ensure-function accessor) object))))) (cons (funcall (ensure-function accessor) object)))))
(if (listp path) (if (listp path)
......
"2.26.114" "2.26.115"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment