diff --git a/action.lisp b/action.lisp index 113b880107153ded9a82de5d6463efeda59689f3..b57bf06b62a97507cb47a7fa31d07af8ffd81f52 100644 --- a/action.lisp +++ b/action.lisp @@ -17,15 +17,18 @@ #:action-status #:action-stamp #:action-done-p #:component-operation-time #:mark-operation-done #:compute-action-stamp #:perform #:perform-with-restarts #:retry #:accept #:feature - #:gather-actions #:operated-components - #:traverse-sub-actions #:dependency-files + #:gather-actions #:required-components + #:traverse-sub-actions #:required-files )) (in-package :asdf/action) (deftype action () '(cons operation component)) ;; a step to be performed while building the system -(declaim (ftype (function (t &rest t) t) operated-components traverse-actions) - (ftype (function (t t &rest t) t) - traverse-sub-actions dependency-files)) + +(defgeneric* traverse-actions (actions &key)) +(defgeneric* traverse-sub-actions (operation component &key)) +(defgeneric* required-components (component &key)) +(defgeneric* required-files (operation component &key)) + ;;;; Convenience methods (defmacro define-convenience-action-methods diff --git a/asdf.asd b/asdf.asd index a9c4bbac94571bdbc134a634c45836baa24d44d4..3b592b0e5dd3b9c55c5443a5026800c44d09d130 100644 --- a/asdf.asd +++ b/asdf.asd @@ -15,7 +15,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." - :version "2.26.122" ;; to be automatically updated by bin/bump-revision + :version "2.26.123" ;; to be automatically updated by bin/bump-revision :depends-on () :components ((:module "build" :components ((:file "asdf")))) :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op asdf/defsystem)))) diff --git a/bundle.lisp b/bundle.lisp index ee4e79d82ce62c2c414619a4100db5b0a410f743..a2efd1eb604ab64bc1ebe63fadbf5c106a3a9be2 100644 --- a/bundle.lisp +++ b/bundle.lisp @@ -9,7 +9,7 @@ (:export #:bundle-op #:bundle-op-build-args #:bundle-type #:bundle-system #:bundle-pathname-type #:fasl-op #:load-fasl-op #:lib-op #:dll-op #:binary-op - #:monolithic-op #:monolithic-bundle-op #:dependency-files + #:monolithic-op #:monolithic-bundle-op #:required-files #:monolithic-binary-op #:monolithic-fasl-op #:monolithic-lib-op #:monolithic-dll-op #:program-op #:compiled-file #:precompiled-system #:prebuilt-system @@ -219,13 +219,13 @@ (defmethod component-depends-on ((o monolithic-lib-op) (c system)) (declare (ignorable o)) - `((lib-op ,@(operated-components c :other-systems t :component-type 'system + `((lib-op ,@(required-components c :other-systems t :component-type 'system :goal-operation 'load-op :keep-operation 'load-op)))) (defmethod component-depends-on ((o monolithic-fasl-op) (c system)) (declare (ignorable o)) - `((fasl-op ,@(operated-components c :other-systems t :component-type 'system + `((fasl-op ,@(required-components c :other-systems t :component-type 'system :goal-operation 'load-fasl-op :keep-operation 'load-fasl-op)))) @@ -245,7 +245,7 @@ (defmethod component-depends-on ((o lib-op) (c system)) (declare (ignorable o)) - `((compile-op ,@(operated-components c :other-systems nil :component-type '(not system) + `((compile-op ,@(required-components c :other-systems nil :component-type '(not system) :goal-operation 'load-op :keep-operation 'load-op)))) @@ -268,7 +268,7 @@ `((,op ,c)) (call-next-method))) -(defun* dependency-files (o c &key (test 'identity) (key 'output-files)) +(defun* required-files (o c &key (test 'identity) (key 'output-files)) (while-collecting (collect) (visit-dependencies () o c #'(lambda (sub-o sub-c) @@ -276,7 +276,7 @@ :when (funcall test f) :do (collect f)))))) (defmethod input-files ((o bundle-op) (c system)) - (dependency-files o c :test 'bundlable-file-p :key 'output-files)) + (required-files o c :test 'bundlable-file-p :key 'output-files)) (defun* select-bundle-operation (type &optional monolithic) (ecase type diff --git a/concatenate-source.lisp b/concatenate-source.lisp index c4576643630b15706fef0947a21fa3e32bb5328a..e64e62e765b219d69fdb41db384553b458723792 100644 --- a/concatenate-source.lisp +++ b/concatenate-source.lisp @@ -42,7 +42,7 @@ :with other-encodings = '() :with around-compile = (around-compile-hook s) :with other-around-compile = '() - :for c :in (operated-components + :for c :in (required-components s :goal-operation 'compile-op :keep-operation 'compile-op :other-systems (operation-monolithic-p operation)) @@ -65,14 +65,14 @@ (return inputs))) (defmethod input-files ((o load-concatenated-source-op) (s system)) - (dependency-files o s)) + (required-files o s)) (defmethod input-files ((o compile-concatenated-source-op) (s system)) - (dependency-files o s)) + (required-files o s)) (defmethod output-files ((o compile-concatenated-source-op) (s system)) (let ((input (first (input-files o s)))) (list (compile-file-pathname input)))) (defmethod input-files ((o load-compiled-concatenated-source-op) (s system)) - (dependency-files o s)) + (required-files o s)) (defmethod perform ((o concatenate-source-op) (s system)) (let ((inputs (input-files o s)) diff --git a/header.lisp b/header.lisp index f48947ac811b010c602f6187656db8539fb66360..38fda3acb2e9fb80c9a877ffd2a388e626381322 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*- -;;; This is ASDF 2.26.122: Another System Definition Facility. +;;; This is ASDF 2.26.123: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to . diff --git a/plan.lisp b/plan.lisp index 649fe3d9fd2c978f3eca05ca7b569dedc517995b..aee70ddb98fb13856e6f02e5c49b37e54af74ecf 100644 --- a/plan.lisp +++ b/plan.lisp @@ -24,7 +24,7 @@ #:planned-p #:index #:forced #:forced-not #:total-action-count #:planned-action-count #:planned-output-action-count #:visited-actions #:visiting-action-set #:visiting-action-list #:plan-actions-r - #:operated-components #:filtered-sequential-plan + #:required-components #:filtered-sequential-plan #:plan-action-filter #:plan-component-type #:plan-keep-operation #:plan-keep-component #:traverse-actions #:traverse-sub-actions)) (in-package :asdf/plan) @@ -407,7 +407,7 @@ processed in order by OPERATE.")) (typep c keep-component)) :collect (cons o c)))) -(defun* operated-components (system &rest keys &key (goal-operation 'load-op) &allow-other-keys) +(defun* required-components (system &rest keys &key (goal-operation 'load-op) &allow-other-keys) (remove-duplicates (mapcar 'cdr (apply 'traverse-sub-actions (make-operation goal-operation) system keys)) :from-end t)) diff --git a/upgrade.lisp b/upgrade.lisp index a4567af5177b22f8ca44051e65778cfbb1877046..9abc2e04fab6f2cd5a36550cf1a3b7b329b85b8d 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -45,7 +45,7 @@ ;; "2.345.6" would be a development version in the official upstream ;; "2.345.0.7" would be your seventh local modification of official release 2.345 ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6 - (asdf-version "2.26.122") + (asdf-version "2.26.123") (existing-asdf (find-class (find-symbol* :component :asdf nil) nil)) (existing-version *asdf-version*) (already-there (equal asdf-version existing-version))) diff --git a/version.lisp-expr b/version.lisp-expr index 761fa61cc2ef29a8299047de57fb5376ae1b6510..707e63658a8642301d9226a71aa634ff227db5cd 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.26.122" +"2.26.123"