From 7896e94fb4a09758ef228a65180a05e8922753ea Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Sun, 3 Mar 2013 21:08:58 -0500 Subject: [PATCH] 2.31.10: Fix some exports. Fix some tests. Documentation tweaks. --- TODO | 4 ++-- asdf.asd | 2 +- component.lisp | 6 ++++-- doc/index.html | 17 +++++++++++------ header.lisp | 2 +- interface.lisp | 1 + test/make-hello-world.lisp | 1 + test/test-encodings.script | 1 + test/test-program.script | 1 + test/test-sysdef-asdf.script | 5 ++++- uiop/package.lisp | 2 +- upgrade.lisp | 2 +- version.lisp-expr | 2 +- 13 files changed, 30 insertions(+), 16 deletions(-) diff --git a/TODO b/TODO index 1bf7b141..fbe42642 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,5 @@ -* make sure asdf-driver works with asdf 2.26. -* have a mode to explain WHY a module needs to be recompiled. +* have some automated test to make sure asdf-driver works with asdf 2.26 +* have a mode to explain WHY a componnet needs to be recompiled. * have a better defsystem form verifier - see lp#1007335 * have a function verify-strict-asd that can verify a asd is pure lp#541562 Then if it passes, use load-strict-asd. diff --git a/asdf.asd b/asdf.asd index c7a50847..2d207094 100644 --- a/asdf.asd +++ b/asdf.asd @@ -74,7 +74,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." - :version "2.31.9" ;; to be automatically updated by make bump-version + :version "2.31.10" ;; 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. diff --git a/component.lisp b/component.lisp index 7f6c8ed9..c31f5981 100644 --- a/component.lisp +++ b/component.lisp @@ -12,7 +12,8 @@ #:file-component #:source-file #:c-source-file #:java-source-file #:static-file #:doc-file #:html-file - #:source-file-type ;; backward-compatibility + #:file-type + #:source-file-type #:source-file-explicit-type ;; backward-compatibility #:component-in-order-to #:component-sibling-dependencies #:component-if-feature #:around-compile-hook #:component-description #:component-long-description @@ -143,7 +144,8 @@ another pathname in a degenerate way.")) (defclass file-component (child-component) ((type :accessor file-type :initarg :type))) ; no default (defclass source-file (file-component) - ((type :initform nil))) ;; NB: many systems have come to rely on this default. + ((type :accessor source-file-explicit-type ;; backward-compatibility + :initform nil))) ;; NB: many systems have come to rely on this default. (defclass c-source-file (source-file) ((type :initform "c"))) (defclass java-source-file (source-file) diff --git a/doc/index.html b/doc/index.html index c177ea3e..c60abc5e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -52,7 +52,10 @@ <p>ASDF stands for <em>A</em>nother <em>S</em>ystem <em>D</em>efinition <em>F</em>acility, in the continuity of the Lisp <tt>DEFSYSTEM</tt> of yore. </p> - <p><tt>asdf/driver</tt> is a Common Lisp portability library and runtime support system + <p><tt>asdf/driver</tt>, + also known as <tt>uiop</tt>, + the Utilities for Implementation- and OS- Portability, + is a Common Lisp portability library and runtime support system that helps you write Common Lisp software in a portable way. </p> <p>In addition to many general-purpose Lisp utilities, @@ -260,7 +263,7 @@ Peter Graves <gnooth@gmail.com> <tt>common-lisp-controller</tt> and <tt>cl-launch</tt> used to provide similar mechanisms, and have also been superseded by <tt>asdf-output-translations</tt>. </li> - <li><tt>asdf-bundle</tt>, née <tt>asdf-ecl</tt>, + <li><tt>asdf-bundle</tt>, née <tt>asdf-ecl</tt>, allowed you to create a single-file bundle out of a system, for easier delivery. It is now a builtin part of <tt>asdf/defsystem</tt>, @@ -268,12 +271,14 @@ Peter Graves <gnooth@gmail.com> or (on supported implementations), a standalone executable program. </li> <li><tt>asdf-utils</tt> was a collection of utilities that originated with ASDF. - It is now superseded by <tt>asdf/driver</tt>, which is part of ASDF, - and exports its functionality in its own package <tt>asdf/driver</tt>. + It is now superseded by <tt>asdf/driver</tt>, aka <tt>uiop</tt>, + which is part of ASDF, + and exports its functionality + in its own package <tt>uiop</tt>. </li> <li><tt>asdf-condition-control</tt>, initially part of XCVB's <tt>xcvb-driver</tt>, allowed you to muffle uninteresting conditions during compilation. - Is now superseded by equivalent functionality in <tt>asdf/driver</tt>. + Is now superseded by equivalent functionality in <tt>uiop</tt>. </li> </ul> @@ -374,7 +379,7 @@ Peter Graves <gnooth@gmail.com> <a class="nav" href="http://common-lisp.net/" title="Common-Lisp.net"> <img src="http://common-lisp.net/project/cl-containers/shared/buttons/lisp-lizard.png" width="80" height="15" title="Common-Lisp.net" alt="Common-Lisp.net button" /></a> <p><span class="copyright"Copyright © 2001-2013 Daniel Barlow and contributors</span></p> <p>ASDF has an <a href="http://www.opensource.org/licenses/mit-license.php">MIT style</a> license</p> - <div id="timestamp">Last updated 2013-03-02</div> + <div id="timestamp">Last updated 2013-03-03</div> </div> </body> </html> diff --git a/header.lisp b/header.lisp index 4e1bbd6a..840ec9df 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- -;;; This is ASDF 2.31.9: Another System Definition Facility. +;;; This is ASDF 2.31.10: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. diff --git a/interface.lisp b/interface.lisp index efaf6681..13e5cc27 100644 --- a/interface.lisp +++ b/interface.lisp @@ -54,6 +54,7 @@ #:file-component #:source-file #:c-source-file #:java-source-file #:cl-source-file #:cl-source-file.cl #:cl-source-file.lsp #:static-file #:doc-file #:html-file + #:file-type #:source-file-type #:component-children ; component accessors diff --git a/test/make-hello-world.lisp b/test/make-hello-world.lisp index 82fe3932..de6a5e33 100644 --- a/test/make-hello-world.lisp +++ b/test/make-hello-world.lisp @@ -6,5 +6,6 @@ (with-test () (register-directory *asdf-directory*) ;; we need asdf-driver, and ECL can dump. + (register-directory (subpathname *asdf-directory* "uiop/")) (operate 'load-fasl-op :hello-world-example) (operate 'program-op :hello-world-example)) diff --git a/test/test-encodings.script b/test/test-encodings.script index 13e0bada..903aebcf 100644 --- a/test/test-encodings.script +++ b/test/test-encodings.script @@ -64,6 +64,7 @@ ;; Try to load asdf-encodings (setf *central-registry* (list *asdf-directory* ;; be sure that *OUR* asdf is first of any possible ASDF + (subpathname *asdf-directory* "uiop/") ;; be sure that *OUR* asdf is first of any possible ASDF ;; try finding asdf-encodings it right next to asdf. (subpathname *asdf-directory* "../asdf-encodings/"))) (unless (find-system :asdf-encodings nil) diff --git a/test/test-program.script b/test/test-program.script index 8f3aff07..38b14b3f 100644 --- a/test/test-program.script +++ b/test/test-program.script @@ -16,6 +16,7 @@ ;; Try to load lisp-invocation from xcvb (setf *central-registry* (list *asdf-directory* ;; be sure that *OUR* asdf is first of any possible ASDF + (subpathname *asdf-directory* "uiop/") ;; try finding xcvb's lisp-invocation right next to asdf. (subpathname *asdf-directory* "../xcvb/"))) (unless (find-system :lisp-invocation nil) diff --git a/test/test-sysdef-asdf.script b/test/test-sysdef-asdf.script index a1bf114d..c6bf0d9d 100644 --- a/test/test-sysdef-asdf.script +++ b/test/test-sysdef-asdf.script @@ -5,5 +5,8 @@ (load-system :asdf) (initialize-source-registry - `(:source-registry (:directory ,*asdf-directory*) :ignore-inherited-configuration)) + `(:source-registry + (:directory ,*asdf-directory*) + (:directory ,(subpathname *asdf-directory* "uiop/")) + :ignore-inherited-configuration)) (load-system :asdf) diff --git a/uiop/package.lisp b/uiop/package.lisp index 91e6360f..1a62eb1e 100644 --- a/uiop/package.lisp +++ b/uiop/package.lisp @@ -14,7 +14,7 @@ (:use :common-lisp) (:export #:find-package* #:find-symbol* #:symbol-call - #:intern* #:export* #:import* #:shadowing-export* #:shadow* #:make-symbol* #:unintern* + #:intern* #:export* #:import* #:shadowing-import* #:shadow* #:make-symbol* #:unintern* #:symbol-shadowing-p #:home-package-p #:symbol-package-name #:standard-common-lisp-symbol-p #:reify-package #:unreify-package #:reify-symbol #:unreify-symbol diff --git a/upgrade.lisp b/upgrade.lisp index 926601f3..3bd1aa95 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -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 "2.31.9") + (asdf-version "2.31.10") (existing-version (asdf-version))) (setf *asdf-version* asdf-version) (when (and existing-version (not (equal asdf-version existing-version))) diff --git a/version.lisp-expr b/version.lisp-expr index 15b30f36..569c115f 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.31.9" +"2.31.10" -- GitLab