diff --git a/asdf.lisp b/asdf.lisp index b5dbd7713bd00b21fa61548e74aa136fc1d0748f..ce1eacd201b348a27331ddb47bbaef95c46e20e7 100644 --- a/asdf.lisp +++ b/asdf.lisp @@ -105,9 +105,10 @@ #:*central-registry* ; variables #:*compile-file-warnings-behaviour* #:*compile-file-failure-behaviour* - #:*asdf-revision* #:*resolve-symlinks* + #:asdf-version + #:operation-error #:compile-failed #:compile-warned #:compile-error #:error-name #:error-pathname @@ -171,9 +172,12 @@ ;;;; ------------------------------------------------------------------------- ;;;; User-visible parameters ;;;; -(defparameter *asdf-revision* +(defparameter *asdf-version* ;; the 1+ hair is to ensure that we don't do an inadvertent find and replace - (subseq "REVISION:1.500" (1+ (length "REVISION")))) + (subseq "VERSION:1.500" (1+ (length "VERSION")))) + +(defun asdf-version () + *asdf-version*) (defvar *resolve-symlinks* t "Determine whether or not ASDF resolves symlinks when defining systems. @@ -2133,10 +2137,11 @@ with a different configuration, so the configuration would be re-read then." (validate-source-registry-form (car forms)))) (defun validate-source-registry-directory (directory) - (let ((files (sort (directory (merge-pathnames - (make-pathname :name :wild :type :wild) - directory) - #+sbcl :resolve-symlinks #+sbcl nil) + (let ((files (sort (ignore-errors + (directory (merge-pathnames + (make-pathname :name :wild :type :wild) + directory) + #+sbcl :resolve-symlinks #+sbcl nil)) #'string< :key #'namestring))) `(:source-registry ,@(loop :for file :in files :append @@ -2176,9 +2181,10 @@ with a different configuration, so the configuration would be re-read then." (return `(:source-registry ,@(nreverse directives))))))))) (defun collect-asd-subdirectories (directory &key (exclude *default-exclusions*) collect) - (let* ((files (directory (merge-pathnames #P"**/*.asd" directory) - #+sbcl #+sbcl :resolve-symlinks nil - #+clisp #+clisp :circle t)) + (let* ((files (ignore-errors + (directory (merge-pathnames #P"**/*.asd" directory) + #+sbcl #+sbcl :resolve-symlinks nil + #+clisp #+clisp :circle t))) (dirs (remove-duplicates (mapcar #'pathname-sans-name+type files) :test #'equal))) (loop :for dir :in dirs @@ -2358,9 +2364,10 @@ with a different configuration, so the configuration would be re-read then." ;;;; ----------------------------------------------------------------- ;;;; Done! (when *load-verbose* - (asdf-message ";; ASDF, revision ~a" *asdf-revision*)) + (asdf-message ";; ASDF, version ~a" (asdf-version))) (pushnew :asdf *features*) +;;(pushnew :asdf2 *features*) ;; do that when we reach version 2 (provide :asdf) diff --git a/bin/bump-revision-and-tag.sh b/bin/bump-revision-and-tag.sh index d8e15fbf21e9f39382a156f43f0134eb55cb9728..40a9c41356b8777f18866bd3d88cd03072453b1d 100755 --- a/bin/bump-revision-and-tag.sh +++ b/bin/bump-revision-and-tag.sh @@ -35,7 +35,7 @@ fi new_version="$major.$bumped" cp asdf.lisp asdf.bak -perl -pi -e "s/REVISION:[^\"]*\"/REVISION:$new_version\"/" asdf.lisp +perl -pi -e "s/VERSION:[^\"]*\"/VERSION:$new_version\"/" asdf.lisp if [ ! "$?" == "0" ]; then echo "Unable to perl replace version" exit -3 diff --git a/website/source/manual.mmd b/website/source/manual.mmd index 4ed2fd8b67211135be38c09f5efe863ca58ce027..58c49c59e2f80a902b4f4c77173df7a2091b9257 100644 --- a/website/source/manual.mmd +++ b/website/source/manual.mmd @@ -823,8 +823,6 @@ ASDF includes code to control where the binaries files are places. The location ## Special variables -{docs *asdf-revision*} - {docs *central-registry*} {docs *compile-file-warnings-behaviour*}