Commit d862e5a9 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

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

Should make fe[nl]ix happy.
parent 548d0c9a
......@@ -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))))
......
......@@ -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)
......
......@@ -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
......
;; -*- 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>.
......
......@@ -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)))
......
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