From a075e4be3aa5cc02e5d5fc52a3f9638a911c0ade Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Tue, 16 Apr 2013 15:34:45 -0400 Subject: [PATCH] 2.33.4: various tweaks export sequential-plan; recognize original-initargs as exported but not defined (slot name); don't error while testing for not-defined-yet type (helps POIU when symbol exists but not type); reindent a clause of compute-action-stamp. --- asdf.asd | 2 +- header.lisp | 2 +- interface.lisp | 2 +- plan.lisp | 6 +++--- test/test-utilities.script | 1 + uiop/utility.lisp | 3 ++- upgrade.lisp | 2 +- version.lisp-expr | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/asdf.asd b/asdf.asd index e54749ad..e2b92fc9 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.33.3" ;; to be automatically updated by make bump-version + :version "2.33.4" ;; 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 4de6f848..d84fc911 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- -;;; This is ASDF 2.33.3: Another System Definition Facility. +;;; This is ASDF 2.33.4: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. diff --git a/interface.lisp b/interface.lisp index 6c801372..61f404cd 100644 --- a/interface.lisp +++ b/interface.lisp @@ -19,7 +19,7 @@ ;; TODO: automatically generate interface with reexport? (:export #:defsystem #:find-system #:locate-system #:coerce-name - #:oos #:operate #:traverse #:perform-plan + #:oos #:operate #:traverse #:perform-plan #:sequential-plan #:system-definition-pathname #:with-system-definitions #:search-for-system-definition #:find-component #:component-find-path #:compile-system #:load-system #:load-systems diff --git a/plan.lisp b/plan.lisp index d42f9369..bdf26513 100644 --- a/plan.lisp +++ b/plan.lisp @@ -241,9 +241,9 @@ the action of OPERATION on COMPONENT in the PLAN")) (and all-present up-to-date-p (operation-done-p o c) (not (action-forced-p plan o c)))) (values done-stamp ;; return the hard-earned timestamp (or just-done - (or out-op ;; a file-creating op is done when all files are up to date - ;; a image-effecting a placeholder op is done when it was actually run, - (and op-time (eql op-time done-stamp))))) ;; with the matching stamp + out-op ;; a file-creating op is done when all files are up to date + ;; a image-effecting a placeholder op is done when it was actually run, + (and op-time (eql op-time done-stamp)))) ;; with the matching stamp ;; done-stamp invalid: return a timestamp in an indefinite future, action not done yet (values t nil))))) diff --git a/test/test-utilities.script b/test/test-utilities.script index bb5a6a1c..3af2c825 100644 --- a/test/test-utilities.script +++ b/test/test-utilities.script @@ -110,6 +110,7 @@ asdf/component:version asdf/lisp-action:flags asdf/operation:feature + asdf/operation:original-initargs asdf/plan:index asdf/plan:forced asdf/plan:forced-not diff --git a/uiop/utility.lisp b/uiop/utility.lisp index 825a48f7..ab0b99c7 100644 --- a/uiop/utility.lisp +++ b/uiop/utility.lisp @@ -455,7 +455,8 @@ a simple vector of length 2, arguments to find-symbol* with result as above, or a string describing the format-control of a simple-condition." (etypecase x (symbol (typep condition x)) - ((simple-vector 2) (typep condition (find-symbol* (svref x 0) (svref x 1) nil))) + ((simple-vector 2) + (ignore-errors (typep condition (find-symbol* (svref x 0) (svref x 1) nil)))) (function (funcall x condition)) (string (and (typep condition 'simple-condition) ;; On SBCL, it's always set and the check triggers a warning diff --git a/upgrade.lisp b/upgrade.lisp index ffc4297b..328bc4c2 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.33.3") + (asdf-version "2.33.4") (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 0bdfd007..80bf63d4 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.33.3" +"2.33.4" -- GitLab