Commit 08635fc3 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

2.26.167: fix mis-parenthesization and bad format control in previous package refactoring.

Also, rename ensure-pathname-absolute to ensure-absolute-pathname,
to avoid nasty messages while upgrading.
Fix upgrade test.
parent aa031e18
......@@ -174,7 +174,7 @@ You can put together sentences using this phrase."))
(absolute-pathnames
(loop
:for pathname :in pathnames
:collect (ensure-pathname-absolute pathname directory))))
:collect (ensure-absolute-pathname pathname directory))))
;; 2- Translate those pathnames as required
(if fixedp
absolute-pathnames
......
......@@ -66,7 +66,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.26.166" ;; to be automatically updated by make bump-version
:version "2.26.167" ;; to be automatically updated by make bump-version
:depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8
;; For most purposes, asdf itself specially counts as a builtin system.
......
......@@ -32,9 +32,9 @@
;; If no absolute pathname was found, we return NIL.
(check-type pathname (or null string pathname))
(resolve-symlinks*
(ensure-pathname-absolute
(ensure-absolute-pathname
(parse-unix-namestring pathname :type :directory)
#'(lambda () (ensure-pathname-absolute
#'(lambda () (ensure-absolute-pathname
(load-pathname) 'get-pathname-defaults nil))
nil)))
......
......@@ -223,7 +223,7 @@ or the original (parsed) pathname if it is false (the default)."
(when (typep pathname '(or null logical-pathname)) (return pathname))
(let ((p pathname))
(unless (absolute-pathname-p p)
(setf p (or (absolute-pathname-p (ensure-pathname-absolute p 'get-pathname-defaults nil))
(setf p (or (absolute-pathname-p (ensure-absolute-pathname p 'get-pathname-defaults nil))
(return p))))
(when (logical-pathname-p p) (return p))
(let ((found (probe-file* p :truename t)))
......
......@@ -159,9 +159,9 @@ Going forward, we recommend new users should be using the source-registry.
(block nil
(when (directory-pathname-p defaults)
(if-let (file (probe-file*
(ensure-pathname-absolute
(ensure-absolute-pathname
(parse-unix-namestring name :type "asd")
#'(lambda () (ensure-pathname-absolute defaults 'get-pathname-defaults nil))
#'(lambda () (ensure-absolute-pathname defaults 'get-pathname-defaults nil))
nil)
:truename truename))
(return file))
......
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.26.166: Another System Definition Facility.
;;; This is ASDF 2.26.167: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -355,8 +355,8 @@ or when loading the package is optional."
(package-name from-package)
(or (home-package-p import-me from-package) (symbol-package-name import-me))
(package-name to-package) status
(and status (or (home-package-p existing to-package) (symbol-package-name existing))))
(shadowing-import import-me to-package)))))))
(and status (or (home-package-p existing to-package) (symbol-package-name existing)))))
(shadowing-import import-me to-package))))))
(defun ensure-import (name to-package from-package shadowed imported)
(check-type name string)
(check-type to-package package)
......@@ -449,7 +449,7 @@ or when loading the package is optional."
(remhash name inherited)
(ensure-shadowing-import name to-package (second in) shadowed imported))
(im
(error "Symbol ~S import from ~S~:[~*~; actually ~:[~*uninterned~;from ~S~]~] conflicts with existing symbol in ~S~:[~*~; actually ~:[~*uninterned~;from ~S~]~]"
(error "Symbol ~S import from ~S~:[~; actually ~:[uninterned~;~:*from ~S~]~] conflicts with existing symbol in ~S~:[~; actually ~:[uninterned~;from ~:*~S~]~]"
name (package-name from-package)
(home-package-p symbol from-package) (symbol-package-name symbol)
(package-name to-package)
......@@ -617,8 +617,9 @@ or when loading the package is optional."
(loop :for (p . syms) :in shadowing-import-from
:for pp = (find-package* p) :do
(dolist (sym syms) (ensure-shadowing-import (string sym) package pp shadowed imported)))
(dolist (p mix)
(do-external-symbols (sym p) (ensure-mix (symbol-name sym) sym package p shadowed imported inherited)))
(loop :for p :in mix
:for pp = (find-package* p) :do
(do-external-symbols (sym pp) (ensure-mix (symbol-name sym) sym package pp shadowed imported inherited)))
(loop :for (p . syms) :in import-from
:for pp = (find-package p) :do
(dolist (sym syms) (ensure-import (symbol-name sym) package pp shadowed imported)))
......
......@@ -25,7 +25,7 @@
#:split-unix-namestring-directory-components
;; Absolute and relative pathnames
#:subpathname #:subpathname*
#:ensure-pathname-absolute
#:ensure-absolute-pathname
#:pathname-root #:pathname-host-pathname
#:subpathp
;; Checking constraints
......@@ -537,10 +537,10 @@ then it is merged with the PATHNAME-DIRECTORY-PATHNAME of PATHNAME."
(let ((enough (enough-namestring maybe-subpath base-pathname)))
(and (relative-pathname-p enough) (pathname enough))))))
(defun* ensure-pathname-absolute (path &optional defaults (on-error 'error))
(defun* ensure-absolute-pathname (path &optional defaults (on-error 'error))
(cond
((absolute-pathname-p path))
((stringp path) (ensure-pathname-absolute (pathname path) defaults on-error))
((stringp path) (ensure-absolute-pathname (pathname path) defaults on-error))
((not (pathnamep path)) (call-function on-error "not a valid pathname designator ~S" path))
((let ((default-pathname (if (pathnamep defaults) defaults (call-function defaults))))
(or (if (absolute-pathname-p default-pathname)
......
......@@ -465,7 +465,8 @@ is bound, write a message and exit on an error. If
((,*asdf-directory*) ,(output-location "asdf"))
(t ,(output-location "root"))
:ignore-inherited-configuration)))
(set (asym :*central-registry*) `(,*test-directory*))
(when (asym :*central-registry* nil nil)
(set (asym :*central-registry*) `(,*test-directory*)))
(when (asym :*asdf-verbose*) (setf (asymval :*asdf-verbose*) t))
(when (asym :*verbose-out*) (setf (asymval :*verbose-out*) *standard-output*))
(when (asym :system-source-directory nil nil)
......
......@@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
;; "3.4.5.67" would be a development version in the official upstream of 3.4.5.
;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5
;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
(asdf-version "2.26.166")
(asdf-version "2.26.167")
(existing-version (asdf-version)))
(setf *asdf-version* asdf-version)
(when (and existing-version (not (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