Commit 3b3610a3 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

3.0.1.6: have other traverse variants not call plan-actions, either

parent e8f02dea

asdf.asd

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
  :licence "MIT"

  :description "Another System Definition Facility"

  :long-description "ASDF builds Common Lisp software organized into defined systems."

  :version "3.0.1.5" ;; to be automatically updated by make bump-version

  :version "3.0.1.6" ;; 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.

header.lisp

+1 −1
Original line number Diff line number Diff line 
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-

;;; This is ASDF 3.0.1.5: Another System Definition Facility.

;;; This is ASDF 3.0.1.6: Another System Definition Facility.

;;;

;;; Feedback, bug reports, and patches are all welcome:

;;; please mail to <asdf-devel@common-lisp.net>.

plan.lisp

+7 −3
Original line number Diff line number Diff line
@@ -391,6 +391,9 @@ the action of OPERATION on COMPONENT in the PLAN")) 
           :when (or force (not (nth-value 1 (compute-action-stamp nil o c))))

           :do (perform-with-restarts o c)))



  (defmethod plan-operates-on-p ((plan plan-traversal) (component-path list))

    (plan-operates-on-p (plan-actions plan) component-path))



  (defmethod plan-operates-on-p ((plan list) (component-path list))

    (find component-path (mapcar 'cdr plan)

          :test 'equal :key 'component-find-path)))
@@ -422,7 +425,7 @@ the action of OPERATION on COMPONENT in the PLAN")) 
    (let ((plan (apply 'make-instance (or plan-class 'filtered-sequential-plan) keys)))

      (loop* :for (o . c) :in actions :do

             (traverse-action plan o c t))

      (plan-actions plan)))

      plan))



  (define-convenience-action-methods traverse-sub-actions (operation component &key))

  (defmethod traverse-sub-actions ((operation operation) (component component) &rest keys &key &allow-other-keys)
@@ -438,7 +441,8 @@ the action of OPERATION on COMPONENT in the PLAN")) 


  (defmethod required-components (system &rest keys &key (goal-operation 'load-op) &allow-other-keys)

    (remove-duplicates

     (mapcar 'cdr (apply 'traverse-sub-actions goal-operation system

                         (remove-plist-key :goal-operation keys)))

     (mapcar 'cdr (plan-actions

                   (apply 'traverse-sub-actions goal-operation system

                          (remove-plist-key :goal-operation keys))))

     :from-end t)))

upgrade.lisp

+1 −1
Original line number Diff line number Diff line
@@ -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 "3.0.1.5")

         (asdf-version "3.0.1.6")

         (existing-version (asdf-version)))

    (setf *asdf-version* asdf-version)

    (when (and existing-version (not (equal asdf-version existing-version)))

version.lisp-expr

+1 −1
Original line number Diff line number Diff line 
"3.0.1.5"
 
"3.0.1.6"