diff --git a/asdf.asd b/asdf.asd index 1f1ec4c2056d794b539c5885e9be1039d8bdec88..91574f02b04af4f560bb3c35f60de3cddc7b8047 100644 --- a/asdf.asd +++ b/asdf.asd @@ -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. diff --git a/header.lisp b/header.lisp index 6909aa8ac32ae4cc0eb36f87593c04f1356e2d63..6b0bc07655daf34eea66b8828e904f57ef6251ac 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;;; -*- 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>. diff --git a/test/run-tests.sh b/test/run-tests.sh index e26c27eaf9366fbda24812ea760ba73d6e2c73c2..3a64513c6c0691c22a37fc4e27195b6403b9e20a 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -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 } diff --git a/test/script-support.lisp b/test/script-support.lisp index afab15b1937c08dea76510653e0b1ff80c94605e..88e1a0e274cba049cfaae9ccbe965dfb709f7dec 100644 --- a/test/script-support.lisp +++ b/test/script-support.lisp @@ -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) diff --git a/uiop/filesystem.lisp b/uiop/filesystem.lisp index 85e2644c8e0262895bb777f1037c4e504a4e4e90..65261708b56858fc7ce1c088cfb5caf57787aa57 100644 --- a/uiop/filesystem.lisp +++ b/uiop/filesystem.lisp @@ -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)) diff --git a/upgrade.lisp b/upgrade.lisp index 63b6b53e9c0bc3bd18d27f13b500e0b4ddade318..25a688d2d52635732c264c2628a284aa5aa55244 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -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))) diff --git a/version.lisp-expr b/version.lisp-expr index 26a6c8cf83b3ac50b982f07b5675feffef64a8b7..04b886b6286b7c5d604604c8e1982ab45685667d 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.32.2" +"2.32.3"