Skip to content
Snippets Groups Projects
Commit 04eebd21 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

2.26.151: tweak asdf.asd to play nicer with asdf-encodings. Better error for convenience functions.

parent b5f74667
No related branches found
No related tags found
No related merge requests found
...@@ -56,7 +56,8 @@ ...@@ -56,7 +56,8 @@
,if-no-operation)) ,if-no-operation))
(defmethod ,function ((,operation operation) ,component ,@more-args) (defmethod ,function ((,operation operation) ,component ,@more-args)
(if (typep ,component 'component) (if (typep ,component 'component)
(error "No defined method for ~S on ~S" ',function ,component) (error "No defined method for ~S on ~/asdf-action:format-action/"
',function (cons ,operation ,component))
(let ((,found (find-component () ,component))) (let ((,found (find-component () ,component)))
(if ,found (if ,found
,(next-method operation found) ,(next-method operation found)
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
;; and compulsory to sort them in defsystem-depends-on order. ;; and compulsory to sort them in defsystem-depends-on order.
:version (:read-file-form "version.lisp-expr") :version (:read-file-form "version.lisp-expr")
:around-compile call-without-redefinition-warnings ;; we need be the same as asdf-driver :around-compile call-without-redefinition-warnings ;; we need be the same as asdf-driver
:encoding :utf-8
:components :components
((:file "header"))) ((:file "header")))
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
:build-pathname "build/asdf" ;; our target :build-pathname "build/asdf" ;; our target
:around-compile call-without-redefinition-warnings ;; we need be the same as asdf-driver :around-compile call-without-redefinition-warnings ;; we need be the same as asdf-driver
:depends-on (:asdf/header :asdf-driver) :depends-on (:asdf/header :asdf-driver)
:encoding :utf-8
:components :components
((:file "upgrade") ((:file "upgrade")
(:file "component" :depends-on ("upgrade")) (:file "component" :depends-on ("upgrade"))
...@@ -60,8 +62,9 @@ ...@@ -60,8 +62,9 @@
: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.150" ;; to be automatically updated by make bump-version :version "2.26.151" ;; to be automatically updated by make bump-version
:depends-on () :depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8
:components :components
((:module "build" ((:module "build"
:components :components
......
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.26.150: Another System Definition Facility. ;;; This is ASDF 2.26.151: 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>.
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,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.150") (asdf-version "2.26.151")
(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))
......
"2.26.150" "2.26.151"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment