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

2.32.3: make getenv-pathname compatible with ASDF 2.26 and earlier.

ASDF 2.26 uses :want-directory where :ensure-directory is meant
in the new parlance. Have ensure-directory be implicit in that case.
parent fa613924
......@@ -74,7 +74,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.32.2" ;; to be automatically updated by make bump-version
:version "2.32.3" ;; 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.
......
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.32.2: Another System Definition Facility.
;;; This is ASDF 2.32.3: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -264,6 +264,7 @@ upgrade_methods () {
'load-asdf-lisp'load-asdf-system
'load-asdf-lisp'compile-load-asdf
'load-asdf-lisp'load-asdf-fasl
'load-asdf-lisp-and-test-uiop'load-asdf-fasl
()'load-asdf-fasl
EOF
}
......
......@@ -501,6 +501,16 @@ is bound, write a message and exit on an error. If
(setf *package* (find-package :asdf-test))
t)
(defun load-asdf-lisp-and-test-uiop (&optional tag)
(load-asdf-lisp tag)
(configure-asdf)
(register-directory *asdf-directory*)
(register-directory *uiop-directory*)
(register-directory *test-directory*)
(DBG :lalatu (asymval :*central-registry*))
(acall :oos (asym :load-op) :uiop)
(acall :oos (asym :load-op) :test-module-depend))
(defun load-asdf (&optional tag)
#+gcl2.6 (load-asdf-lisp tag) #-gcl2.6
(load-asdf-fasl tag)
......
......@@ -418,8 +418,10 @@ TRUENAMIZE uses TRUENAMIZE to resolve as many symlinks as possible."
(loop :for namestring :in (split-string string :separator (string (inter-directory-separator)))
:collect (apply 'parse-native-namestring namestring constraints)))
(defun getenv-pathname (x &rest constraints &key on-error &allow-other-keys)
(defun getenv-pathname (x &rest constraints &key ensure-directory want-directory on-error &allow-other-keys)
;; For backward compatibility with ASDF 2, want-directory implies ensure-directory
(apply 'parse-native-namestring (getenvp x)
:ensure-directory (or ensure-directory want-directory)
:on-error (or on-error
`(error "In (~S ~S), invalid pathname ~*~S: ~*~?" getenv-pathname ,x))
constraints))
......
......@@ -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.32.2")
(asdf-version "2.32.3")
(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