Commit 97b279fa authored by Robert Goldman's avatar Robert Goldman
Browse files

Bump version to 3.3.5

parent bd6e5132
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
:licence "MIT" :licence "MIT"
:description "Another System Definition Facility" :description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems." :long-description "ASDF builds Common Lisp software organized into defined systems."
:version "3.3.4.19" ;; to be automatically updated by make bump-version :version "3.3.5" ;; to be automatically updated by make bump-version
:depends-on () :depends-on ()
:components ((:module "build" :components ((:file "asdf")))) :components ((:module "build" :components ((:file "asdf"))))
. #-asdf3 () #+asdf3 . #-asdf3 () #+asdf3
......
...@@ -65,7 +65,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ...@@ -65,7 +65,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@titlepage @titlepage
@title ASDF: Another System Definition Facility @title ASDF: Another System Definition Facility
@subtitle Manual for Version 3.3.4.19 @subtitle Manual for Version 3.3.5
@c The following two commands start the copyright page. @c The following two commands start the copyright page.
@page @page
@vskip 0pt plus 1filll @vskip 0pt plus 1filll
...@@ -82,7 +82,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ...@@ -82,7 +82,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@node Top, Introduction, (dir), (dir) @node Top, Introduction, (dir), (dir)
@top ASDF: Another System Definition Facility @top ASDF: Another System Definition Facility
@ifnottex @ifnottex
Manual for Version 3.3.4.19 Manual for Version 3.3.5
@end ifnottex @end ifnottex
......
;;; -*- mode: Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; Package: CL-USER ; buffer-read-only: t; -*- ;;; -*- mode: Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; Package: CL-USER ; buffer-read-only: t; -*-
;;; This is ASDF 3.3.4.19: Another System Definition Facility. ;;; This is ASDF 3.3.5: Another System Definition Facility.
;;; ;;;
;;; Feedback, bug reports, and patches are all welcome: ;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>. ;;; please mail to <asdf-devel@common-lisp.net>.
......
...@@ -151,6 +151,9 @@ Some constraints: ...@@ -151,6 +151,9 @@ Some constraints:
(assert-equal ',condition (type-of ,x)) (assert-equal ',condition (type-of ,x))
,x))) ,x)))
(defmacro with-expected-failure ((&optional condition) &body body) (defmacro with-expected-failure ((&optional condition) &body body)
"If CONDITION is non-NIL, then the BODY is expected to fail, and an error will be
raised if it *succeeds*. If non-NIL, CONDITION should evaluate to something that
explains the unexpected success -- typically a string."
`(call-with-expected-failure ,condition (lambda () ,@body))) `(call-with-expected-failure ,condition (lambda () ,@body)))
(defun call-with-expected-failure (condition thunk) (defun call-with-expected-failure (condition thunk)
(if condition (if condition
......
...@@ -332,22 +332,32 @@ ...@@ -332,22 +332,32 @@
(assert-pathnames-equal directory-a-no-slash (list (subpathname *build-directory* "deleteme/a/1.x"))) (assert-pathnames-equal directory-a-no-slash (list (subpathname *build-directory* "deleteme/a/1.x")))
(assert-pathnames-equal directory-b-no-slash (list (subpathname *build-directory* "deleteme/a/b/2")))) (assert-pathnames-equal directory-b-no-slash (list (subpathname *build-directory* "deleteme/a/b/2"))))
(DBG "Test oddball characters in pathnames")
;; let* ((oddball-pathname (merge-pathnames (make-pathname :directory '(:relative "/[foo"))
;; (subpathname *build-directory* "deleteme/")))
;; (oddball-namestring (namestring oddball-pathname)))
;; (DBG "Oddball pathname is " oddball-pathname)
;; (DBG "Oddball namestring is " oddball-namestring)
;; (ensure-directories-exist oddball-pathname)
;; (assert (directory-exists-p oddball-pathname))
;; (pathname oddball-namestring)
;; (assert-equal nil (uiop:subdirectories oddball-namestring))
(with-expected-failure ("UIOP:SUBDIRECTORIES does not handle non-standard pathnames.")
(assert-equal nil (uiop:subdirectories "/[foo")))
(DBG "check to make sure WITH-CURRENT-DIRECTORY checks its parameter for directory pathname") (DBG "check to make sure WITH-CURRENT-DIRECTORY checks its parameter for directory pathname")
(let ((directory-a-no-slash (subpathname *build-directory* "deleteme/a")) (let ((directory-a-no-slash (subpathname *build-directory* "deleteme/a"))
(directory-b-no-slash (subpathname *build-directory* "deleteme/a/b"))) (directory-b-no-slash (subpathname *build-directory* "deleteme/a/b")))
(assert (eq 'with-current-directory 'uiop:with-current-directory)) (assert (eq 'with-current-directory 'uiop:with-current-directory))
(with-current-directory (directory-a-no-slash) (with-current-directory (directory-a-no-slash)
(with-expected-failure () (assert-pathnames-equal (directory-files (getcwd)) (list (subpathname *build-directory* "deleteme/a/1.x"))))
(assert-pathnames-equal (directory-files (getcwd)) (list (subpathname *build-directory* "deleteme/a/1.x")))))
(with-current-directory (directory-b-no-slash) (with-current-directory (directory-b-no-slash)
(with-expected-failure () (assert-pathnames-equal (directory-files (getcwd)) (list (subpathname *build-directory* "deleteme/a/b/2")))
(assert-pathnames-equal (directory-files (getcwd)) (list (subpathname *build-directory* "deleteme/a/b/2")))) (assert-pathnames-equal
(with-expected-failure () (sort (subdirectories (getcwd)) #'string< :key #'(lambda (x) (car (last (pathname-directory x)))))
(assert-pathnames-equal (list (subpathname *build-directory* "deleteme/a/b/c/")
(sort (subdirectories (getcwd)) #'string< :key #'(lambda (x) (car (last (pathname-directory x))))) (subpathname *build-directory* "deleteme/a/b/d/")
(list (subpathname *build-directory* "deleteme/a/b/c/") (subpathname *build-directory* "deleteme/a/b/e/")))))
(subpathname *build-directory* "deleteme/a/b/d/")
(subpathname *build-directory* "deleteme/a/b/e/"))))))
(DBG "check to make sure SUBDIRECTORIES does list subdirectories") (DBG "check to make sure SUBDIRECTORIES does list subdirectories")
......
...@@ -417,7 +417,7 @@ For an empty type, *UNSPECIFIC-PATHNAME-TYPE* is returned." ...@@ -417,7 +417,7 @@ For an empty type, *UNSPECIFIC-PATHNAME-TYPE* is returned."
Unix syntax is used whether or not the underlying system is Unix; Unix syntax is used whether or not the underlying system is Unix;
on such non-Unix systems it is reliably usable only for relative pathnames. on such non-Unix systems it is reliably usable only for relative pathnames.
This function is especially useful to manipulate relative pathnames portably, This function is especially useful to manipulate relative pathnames portably,
where it is of crucial to possess a portable pathname syntax independent of the underlying OS. where it is crucial to possess a portable pathname syntax independent of the underlying OS.
This is what PARSE-UNIX-NAMESTRING provides, and why we use it in ASDF. This is what PARSE-UNIX-NAMESTRING provides, and why we use it in ASDF.
When given a PATHNAME object, just return it untouched. When given a PATHNAME object, just return it untouched.
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
(in-package :uiop/version) (in-package :uiop/version)
(with-upgradability () (with-upgradability ()
(defparameter *uiop-version* "3.3.4.19") (defparameter *uiop-version* "3.3.5")
(defun unparse-version (version-list) (defun unparse-version (version-list)
"From a parsed version (a list of natural numbers), compute the version string" "From a parsed version (a list of natural numbers), compute the version string"
......
...@@ -94,7 +94,7 @@ previously-loaded version of ASDF." ...@@ -94,7 +94,7 @@ previously-loaded version of ASDF."
;; "3.4.5.67" would be a development version in the official branch, on top of 3.4.5. ;; "3.4.5.67" would be a development version in the official branch, on top of 3.4.5.
;; "3.4.5.0.8" would be your eighth local modification of official release 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 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
(asdf-version "3.3.4.19") (asdf-version "3.3.5")
(existing-version (asdf-version))) (existing-version (asdf-version)))
(setf *asdf-version* asdf-version) (setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-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