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

2.26.2: trivial tweaks, making some error reports better,

factoring call-around-hook out of call-with-around-compile-hook.
parent e14eef24
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,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.1" ;; to be automatically updated by bin/bump-revision :version "2.26.2" ;; to be automatically updated by bin/bump-revision
:depends-on () :depends-on ()
:components :components
((:file "asdf"))) ((:file "asdf")))
......
;;; -*- 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.1: Another System Definition Facility. ;;; This is ASDF 2.26.2: 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>.
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,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.1") (asdf-version "2.26.2")
(existing-asdf (find-class 'component nil)) (existing-asdf (find-class 'component nil))
(existing-version *asdf-version*) (existing-version *asdf-version*)
(already-there (equal asdf-version existing-version))) (already-there (equal asdf-version existing-version)))
...@@ -1212,8 +1212,8 @@ processed in order by OPERATE.")) ...@@ -1212,8 +1212,8 @@ processed in order by OPERATE."))
((component :reader error-component :initarg :component) ((component :reader error-component :initarg :component)
(operation :reader error-operation :initarg :operation)) (operation :reader error-operation :initarg :operation))
(:report (lambda (c s) (:report (lambda (c s)
(format s (compatfmt "~@<Error while invoking ~A on ~A~@:>") (format s (compatfmt "~@<~A while invoking ~A on ~A~@:>")
(error-operation c) (error-component c))))) (type-of c) (error-operation c) (error-component c)))))
(define-condition compile-error (operation-error) ()) (define-condition compile-error (operation-error) ())
(define-condition compile-failed (compile-error) ()) (define-condition compile-failed (compile-error) ())
(define-condition compile-warned (compile-error) ()) (define-condition compile-warned (compile-error) ())
...@@ -2456,11 +2456,11 @@ recursive calls to traverse.") ...@@ -2456,11 +2456,11 @@ recursive calls to traverse.")
(let ((*package* (find-package package))) (let ((*package* (find-package package)))
(read-from-string fun)))))))) (read-from-string fun))))))))
(defmethod call-with-around-compile-hook ((c component) thunk) (defun call-around-hook (hook function)
(let ((hook (around-compile-hook c))) (funcall (or (ensure-function hook) 'funcall) function))
(if hook
(funcall (ensure-function hook) thunk) (defmethod call-with-around-compile-hook ((c component) function)
(funcall thunk)))) (call-around-hook (around-compile-hook c) function))
;;; perform is required to check output-files to find out where to put ;;; perform is required to check output-files to find out where to put
;;; its answers, in case it has been overridden for site policy ;;; its answers, in case it has been overridden for site policy
...@@ -2701,8 +2701,8 @@ recursive calls to traverse.") ...@@ -2701,8 +2701,8 @@ recursive calls to traverse.")
(perform-with-restarts op component))))) (perform-with-restarts op component)))))
(defmethod operate (operation-class system &rest args (defmethod operate (operation-class system &rest args
&key verbose version force &allow-other-keys) &key force force-not verbose version &allow-other-keys)
(declare (ignore force)) (declare (ignore force force-not))
(with-system-definitions () (with-system-definitions ()
(let* ((*asdf-verbose* verbose) (let* ((*asdf-verbose* verbose)
(*verbose-out* (if verbose *standard-output* (make-broadcast-stream))) (*verbose-out* (if verbose *standard-output* (make-broadcast-stream)))
...@@ -2736,8 +2736,8 @@ recursive calls to traverse.") ...@@ -2736,8 +2736,8 @@ recursive calls to traverse.")
(perform-plan plan) (perform-plan plan)
(values op plan)))))) (values op plan))))))
(defun* oos (operation-class system &rest args &key force verbose version (defun* oos (operation-class system &rest args
&allow-other-keys) &key force force-not verbose version &allow-other-keys)
(declare (ignore force verbose version)) (declare (ignore force verbose version))
(apply 'operate operation-class system args)) (apply 'operate operation-class system args))
......
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