From 4915f8bc33eb6115b60d901fcbbe8f9387ef2ff8 Mon Sep 17 00:00:00 2001 From: Daniel Kochmanski Date: Sat, 30 Sep 2017 16:07:10 +0200 Subject: [PATCH] bump asdf --- CHANGELOG | 2 +- contrib/asdf/asdf.lisp | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 944b62e8..31d3cf2f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -35,7 +35,7 @@ - ~ext:run-program~: environ argument defaults to ~:default~, when NIL passed empty environment is used - compiler: when gcc fails ecl prints the failing command output -- ASDF has been updated to 3.1.8.7 +- ASDF has been updated to 3.1.8.8 - package local nicknames has been implemented (after SBCL) - hash table extensions are documented in newdoc - various cleanups performed in the compiler diff --git a/contrib/asdf/asdf.lisp b/contrib/asdf/asdf.lisp index cc2b93e1..1a9572ba 100644 --- a/contrib/asdf/asdf.lisp +++ b/contrib/asdf/asdf.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*- -;;; This is ASDF 3.1.8.7: Another System Definition Facility. +;;; This is ASDF 3.1.8.8: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to . @@ -7274,7 +7274,7 @@ previously-loaded version of ASDF." ;; "3.4.5.67" would be a development version in the official branch, on top 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.1.8.7") + (asdf-version "3.1.8.8") (existing-version (asdf-version))) (setf *asdf-version* asdf-version) (when (and existing-version (not (equal asdf-version existing-version))) @@ -9641,8 +9641,9 @@ to be meaningful, or could it just as well have been done in another Lisp image? ;;;; Visiting dependencies of an action and computing action stamps (with-upgradability () - (defun (map-direct-dependencies) (operation component fun) + (defun (map-direct-dependencies) (plan operation component fun) "Call FUN on all the valid dependencies of the given action in the given plan" + (declare (ignore plan)) (loop* :for (dep-o-spec . dep-c-specs) :in (component-depends-on operation component) :for dep-o = (find-operation operation dep-o-spec) :when dep-o @@ -9651,19 +9652,19 @@ to be meaningful, or could it just as well have been done in another Lisp image? :when (action-valid-p dep-o dep-c) :do (funcall fun dep-o dep-c)))) - (defun (reduce-direct-dependencies) (operation component combinator seed) + (defun (reduce-direct-dependencies) (plan operation component combinator seed) "Reduce the direct dependencies to a value computed by iteratively calling COMBINATOR for each dependency action on the dependency's operation and component and an accumulator initialized with SEED." (map-direct-dependencies - operation component + plan operation component #'(lambda (dep-o dep-c) (setf seed (funcall combinator dep-o dep-c seed)))) seed) - (defun (direct-dependencies) (operation component) + (defun (direct-dependencies) (plan operation component) "Compute a list of the direct dependencies of the action within the plan" - (reduce-direct-dependencies operation component #'acons nil)) + (reduce-direct-dependencies plan operation component #'acons nil)) ;; In a distant future, get-file-stamp, component-operation-time and latest-stamp ;; shall also be parametrized by the plan, or by a second model object, @@ -9687,7 +9688,7 @@ initialized with SEED." (block ()) (let ((dep-stamp ; collect timestamp from dependencies (or T if forced or out-of-date) (reduce-direct-dependencies - o c + plan o c #'(lambda (o c stamp) (if-let (it (plan-action-status plan o c)) (latest-stamp stamp (action-stamp it)) @@ -9833,7 +9834,7 @@ initialized with SEED." (return (action-stamp status))) ; Already visited with sufficient need-in-image level! (labels ((visit-action (niip) ; We may visit the action twice, once with niip NIL, then T (map-direct-dependencies ; recursively traverse dependencies - operation component #'(lambda (o c) (traverse-action plan o c niip))) + t operation component #'(lambda (o c) (traverse-action plan o c niip))) (multiple-value-bind (stamp done-p) ; AFTER dependencies have been traversed, (compute-action-stamp plan operation component) ; compute action stamp (let ((add-to-plan-p (or (eql stamp t) (and niip (not done-p))))) @@ -9956,7 +9957,7 @@ initialized with SEED." (define-convenience-action-methods traverse-sub-actions (operation component &key)) (defmethod traverse-sub-actions ((operation operation) (component component) &rest keys &key &allow-other-keys) - (apply 'traverse-actions (direct-dependencies operation component) + (apply 'traverse-actions (direct-dependencies t operation component) :system (component-system component) keys)) (defmethod plan-actions ((plan filtered-sequential-plan)) @@ -11612,9 +11613,9 @@ or of opaque libraries shipped along the source code.")) ;; your component-depends-on method must gather the correct dependencies in the correct order. (while-collecting (collect) (map-direct-dependencies - o c #'(lambda (sub-o sub-c) - (loop :for f :in (funcall key sub-o sub-c) - :when (funcall test f) :do (collect f)))))) + t o c #'(lambda (sub-o sub-c) + (loop :for f :in (funcall key sub-o sub-c) + :when (funcall test f) :do (collect f)))))) (defun pathname-type-equal-function (type) #'(lambda (p) (equalp (pathname-type p) type))) @@ -11774,7 +11775,7 @@ or of opaque libraries shipped along the source code.")) :keep-operation 'basic-load-op)) (while-collecting (x) ;; resolve the sideway-dependencies of s (map-direct-dependencies - 'load-op s + t 'load-op s #'(lambda (o c) (when (and (typep o 'load-op) (typep c 'system)) (x c)))))))