2.26.88: make :read-file-from path relative to system pathname not component.

Should make fe[nl]ix happy.

diff --git a/asdf.asd b/asdf.asd
index 9dc13d0..4062e0c 100644 (file)
--- a/asdf.asd
+++ b/asdf.asd
@@ -15,7 +15,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.26.87" ;; to be automatically updated by bin/bump-revision
+  :version "2.26.88" ;; to be automatically updated by bin/bump-revision
   :depends-on ()
   :components ((:module "build" :components ((:file "asdf"))))
   :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op generate-asdf))))

diff --git a/defsystem.lisp b/defsystem.lisp
index 2bdf4c4..f150be2 100644 (file)
--- a/defsystem.lisp
+++ b/defsystem.lisp
@@ -48,6 +48,7 @@
                 *default-component-class*) nil))
       (sysdef-error "don't recognize component type ~A" type)))
 
+
 ;;; Check inputs
 
 (define-condition duplicate-names (system-definition-error)
@@ -125,7 +126,8 @@
           (setf ret (apply 'make-instance (class-for-type parent type) args)))
       (component-pathname ret) ; eagerly compute the absolute pathname
       (when versionp
-        (unless (parse-version (normalize-version version (component-pathname ret)) nil)
+        (unless (parse-version (normalize-version
+                                version (component-pathname (component-system ret))) nil)
           (warn (compatfmt "~@<Invalid version ~S for component ~S~@[ of ~S~]~@:>")
                 version name parent)))
       (when (typep ret 'parent-component)

diff --git a/doc/asdf.texinfo b/doc/asdf.texinfo
index ab74bed..d644666 100644 (file)
--- a/doc/asdf.texinfo
+++ b/doc/asdf.texinfo
@@ -853,7 +853,7 @@ such a string using the following trivial domain-specific language:
 in addition to being a literal string, it can be an expression of the form
 @code{(:read-file-form <pathname-or-string>)}, which will be resolved
 by reading the first form in the specified pathname or string
-(merged against the pathname of the current component if relative).
+(merged against the pathname of the current system if relative).
 @cindex :version
 
 @end itemize

diff --git a/header.lisp b/header.lisp
index f78c4e6..1abe3e2 100644 (file)
--- a/header.lisp
+++ b/header.lisp
@@ -1,5 +1,5 @@
 ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
-;;; This is ASDF 2.26.87: Another System Definition Facility.
+;;; This is ASDF 2.26.88: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.

diff --git a/upgrade.lisp b/upgrade.lisp
index d8376e2..e8bc6cc 100644 (file)
--- a/upgrade.lisp
+++ b/upgrade.lisp
@@ -32,7 +32,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.26.87")
+         (asdf-version "2.26.88")
          (existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version)))

diff --git a/version.lisp-expr b/version.lisp-expr
index 4f4299c..1fc9452 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.26.87"
+"2.26.88"