From 04eebd21f4121750b78e2cec309855cd20330cb3 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Sun, 27 Jan 2013 00:43:15 -0500 Subject: [PATCH] 2.26.151: tweak asdf.asd to play nicer with asdf-encodings. Better error for convenience functions. --- action.lisp | 3 ++- asdf.asd | 5 ++++- header.lisp | 2 +- upgrade.lisp | 2 +- version.lisp-expr | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/action.lisp b/action.lisp index c536a4bbe..ad9a70ae5 100644 --- a/action.lisp +++ b/action.lisp @@ -56,7 +56,8 @@ ,if-no-operation)) (defmethod ,function ((,operation operation) ,component ,@more-args) (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))) (if ,found ,(next-method operation found) diff --git a/asdf.asd b/asdf.asd index 342202a24..f4a581cba 100644 --- a/asdf.asd +++ b/asdf.asd @@ -15,6 +15,7 @@ ;; and compulsory to sort them in defsystem-depends-on order. :version (:read-file-form "version.lisp-expr") :around-compile call-without-redefinition-warnings ;; we need be the same as asdf-driver + :encoding :utf-8 :components ((:file "header"))) @@ -28,6 +29,7 @@ :build-pathname "build/asdf" ;; our target :around-compile call-without-redefinition-warnings ;; we need be the same as asdf-driver :depends-on (:asdf/header :asdf-driver) + :encoding :utf-8 :components ((:file "upgrade") (:file "component" :depends-on ("upgrade")) @@ -60,8 +62,9 @@ :licence "MIT" :description "Another System Definition Facility" :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 () + #+asdf3 :encoding #+asdf3 :utf-8 :components ((:module "build" :components diff --git a/header.lisp b/header.lisp index ae0db98dc..61641a9b4 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;;; -*- 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: ;;; please mail to <asdf-devel@common-lisp.net>. diff --git a/upgrade.lisp b/upgrade.lisp index f7e7a24ca..b3a97c92c 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -35,7 +35,7 @@ ;; "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.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-version *asdf-version*) (already-there (equal asdf-version existing-version)) diff --git a/version.lisp-expr b/version.lisp-expr index cbc7e6781..98a191f6e 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.26.150" +"2.26.151" -- GitLab