From 77640721f22e7520f2e683ca63d44006923752c7 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Fri, 22 Feb 2013 09:48:26 -0500 Subject: [PATCH] 2.30.3: punt on ECL upgrade after problems with cl-test-grid. Export component-loaded-p. Update some docstrings. --- action.lisp | 14 ++++++++------ asdf.asd | 2 +- defsystem.lisp | 2 +- header.lisp | 5 ++--- interface.lisp | 1 + upgrade.lisp | 2 +- version.lisp-expr | 2 +- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/action.lisp b/action.lisp index 25bec89fb..773cd836d 100644 --- a/action.lisp +++ b/action.lisp @@ -93,17 +93,19 @@ You can put together sentences using this phrase.")) "Returns a list of dependencies needed by the component to perform the operation. A dependency has one of the following forms: - (<operation> <component>*), where <operation> is a class - designator and each <component> is a component - designator, which means that the component depends on + (<operation> <component>*), where <operation> is an operation designator + with respect to FIND-OPERATION in the context of the OPERATION argument, + and each <component> is a component designator with respect to + FIND-COMPONENT in the context of the COMPONENT argument, + and means that the component depends on <operation> having been performed on each <component>; or (FEATURE <feature>), which means that the component depends - on <feature>'s presence in *FEATURES*. + on the <feature> expression satisfying FEATUREP. + (This is DEPRECATED -- use :IF-FEATURE instead.) Methods specialized on subclasses of existing component types - should usually append the results of CALL-NEXT-METHOD to the - list.")) + should usually append the results of CALL-NEXT-METHOD to the list.")) (defgeneric component-self-dependencies (operation component)) (define-convenience-action-methods component-depends-on (operation component)) (define-convenience-action-methods component-self-dependencies (operation component)) diff --git a/asdf.asd b/asdf.asd index 3a6ba97f2..9bd41e95c 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.30.2" ;; to be automatically updated by make bump-version + :version "2.30.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/defsystem.lisp b/defsystem.lisp index 9d8444ec4..548f28d6c 100644 --- a/defsystem.lisp +++ b/defsystem.lisp @@ -67,7 +67,7 @@ (define-condition duplicate-names (system-definition-error) ((name :initarg :name :reader duplicate-names-name)) (:report (lambda (c s) - (format s (compatfmt "~@<Error while defining system: multiple components are given same name ~A~@:>") + (format s (compatfmt "~@<Error while defining system: multiple components are given same name ~S~@:>") (duplicate-names-name c))))) (defun sysdef-error-component (msg type name value) diff --git a/header.lisp b/header.lisp index c8f476dd4..d9f7b520b 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- -;;; This is ASDF 2.30.2: Another System Definition Facility. +;;; This is ASDF 2.30.3: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. @@ -71,8 +71,7 @@ (existing-version-number (and existing-version (read-from-string existing-major-minor))) (away (format nil "~A-~A" :asdf existing-version))) (when (and existing-version (< existing-version-number - #+abcl 2.25 #+clisp 2.27 #+clozure 2.27 - #+cmu 2.018 #+ecl 2.21 #+xcl 2.27)) + (or #+abcl 2.25 #+cmu 2.018 2.27))) (rename-package :asdf away) (when *load-verbose* (format t "; Renamed old ~A package away to ~A~%" :asdf away)))))) diff --git a/interface.lisp b/interface.lisp index c6e60adec..23e280f30 100644 --- a/interface.lisp +++ b/interface.lisp @@ -48,6 +48,7 @@ #:monolithic-load-compiled-concatenated-source-op #:operation-monolithic-p #:required-components + #:component-loaded-p #:component #:parent-component #:child-component #:system #:module #:file-component #:source-file #:c-source-file #:java-source-file diff --git a/upgrade.lisp b/upgrade.lisp index 90e89681f..14eb0fa38 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.30.2") + (asdf-version "2.30.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 4b76984cd..464913af6 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.30.2" +"2.30.3" -- GitLab