Commit 05e9f515 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

2.26.123: declare some functions in a way that makes CMUCL happy. Rename them.

parent d840949c
...@@ -17,15 +17,18 @@ ...@@ -17,15 +17,18 @@
#:action-status #:action-stamp #:action-done-p #:action-status #:action-stamp #:action-done-p
#:component-operation-time #:mark-operation-done #:compute-action-stamp #:component-operation-time #:mark-operation-done #:compute-action-stamp
#:perform #:perform-with-restarts #:retry #:accept #:feature #:perform #:perform-with-restarts #:retry #:accept #:feature
#:gather-actions #:operated-components #:gather-actions #:required-components
#:traverse-sub-actions #:dependency-files #:traverse-sub-actions #:required-files
)) ))
(in-package :asdf/action) (in-package :asdf/action)
(deftype action () '(cons operation component)) ;; a step to be performed while building the system (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) (defgeneric* traverse-actions (actions &key))
traverse-sub-actions dependency-files)) (defgeneric* traverse-sub-actions (operation component &key))
(defgeneric* required-components (component &key))
(defgeneric* required-files (operation component &key))
;;;; Convenience methods ;;;; Convenience methods
(defmacro define-convenience-action-methods (defmacro define-convenience-action-methods
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,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 "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 () :depends-on ()
:components ((:module "build" :components ((:file "asdf")))) :components ((:module "build" :components ((:file "asdf"))))
:in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op asdf/defsystem)))) :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op asdf/defsystem))))
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
(:export (:export
#:bundle-op #:bundle-op-build-args #:bundle-type #:bundle-system #:bundle-pathname-type #:bundle-op #:bundle-op-build-args #:bundle-type #:bundle-system #:bundle-pathname-type
#:fasl-op #:load-fasl-op #:lib-op #:dll-op #:binary-op #: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 #:monolithic-binary-op #:monolithic-fasl-op #:monolithic-lib-op #:monolithic-dll-op
#:program-op #:program-op
#:compiled-file #:precompiled-system #:prebuilt-system #:compiled-file #:precompiled-system #:prebuilt-system
...@@ -219,13 +219,13 @@ ...@@ -219,13 +219,13 @@
(defmethod component-depends-on ((o monolithic-lib-op) (c system)) (defmethod component-depends-on ((o monolithic-lib-op) (c system))
(declare (ignorable o)) (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 :goal-operation 'load-op
:keep-operation 'load-op)))) :keep-operation 'load-op))))
(defmethod component-depends-on ((o monolithic-fasl-op) (c system)) (defmethod component-depends-on ((o monolithic-fasl-op) (c system))
(declare (ignorable o)) (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 :goal-operation 'load-fasl-op
:keep-operation 'load-fasl-op)))) :keep-operation 'load-fasl-op))))
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
(defmethod component-depends-on ((o lib-op) (c system)) (defmethod component-depends-on ((o lib-op) (c system))
(declare (ignorable o)) (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 :goal-operation 'load-op
:keep-operation 'load-op)))) :keep-operation 'load-op))))
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
`((,op ,c)) `((,op ,c))
(call-next-method))) (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) (while-collecting (collect)
(visit-dependencies (visit-dependencies
() o c #'(lambda (sub-o sub-c) () o c #'(lambda (sub-o sub-c)
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
:when (funcall test f) :do (collect f)))))) :when (funcall test f) :do (collect f))))))
(defmethod input-files ((o bundle-op) (c system)) (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) (defun* select-bundle-operation (type &optional monolithic)
(ecase type (ecase type
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
:with other-encodings = '() :with other-encodings = '()
:with around-compile = (around-compile-hook s) :with around-compile = (around-compile-hook s)
:with other-around-compile = '() :with other-around-compile = '()
:for c :in (operated-components :for c :in (required-components
s :goal-operation 'compile-op s :goal-operation 'compile-op
:keep-operation 'compile-op :keep-operation 'compile-op
:other-systems (operation-monolithic-p operation)) :other-systems (operation-monolithic-p operation))
...@@ -65,14 +65,14 @@ ...@@ -65,14 +65,14 @@
(return inputs))) (return inputs)))
(defmethod input-files ((o load-concatenated-source-op) (s system)) (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)) (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)) (defmethod output-files ((o compile-concatenated-source-op) (s system))
(let ((input (first (input-files o s)))) (let ((input (first (input-files o s))))
(list (compile-file-pathname input)))) (list (compile-file-pathname input))))
(defmethod input-files ((o load-compiled-concatenated-source-op) (s system)) (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)) (defmethod perform ((o concatenate-source-op) (s system))
(let ((inputs (input-files o s)) (let ((inputs (input-files o s))
......
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*- ;; -*- 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: ;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>. ;;; please mail to <asdf-devel@common-lisp.net>.
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#:planned-p #:index #:forced #:forced-not #:total-action-count #:planned-p #:index #:forced #:forced-not #:total-action-count
#:planned-action-count #:planned-output-action-count #:visited-actions #:planned-action-count #:planned-output-action-count #:visited-actions
#:visiting-action-set #:visiting-action-list #:plan-actions-r #: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 #:plan-action-filter #:plan-component-type #:plan-keep-operation #:plan-keep-component
#:traverse-actions #:traverse-sub-actions)) #:traverse-actions #:traverse-sub-actions))
(in-package :asdf/plan) (in-package :asdf/plan)
...@@ -407,7 +407,7 @@ processed in order by OPERATE.")) ...@@ -407,7 +407,7 @@ processed in order by OPERATE."))
(typep c keep-component)) (typep c keep-component))
:collect (cons o c)))) :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 (remove-duplicates
(mapcar 'cdr (apply 'traverse-sub-actions (make-operation goal-operation) system keys)) (mapcar 'cdr (apply 'traverse-sub-actions (make-operation goal-operation) system keys))
:from-end t)) :from-end t))
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
;; "2.345.6" would be a development version in the official upstream ;; "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.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 ;; "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-asdf (find-class (find-symbol* :component :asdf nil) nil))
(existing-version *asdf-version*) (existing-version *asdf-version*)
(already-there (equal asdf-version existing-version))) (already-there (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