diff --git a/TODO b/TODO index 1bf7b1413a6cd62b6b53ee4c35e431ffdc319816..fbe426420434f3ff93d54043993eeeae8d39b5c0 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 c7a50847b73b39a4834a3c51bb6792bdbc60097f..2d207094638ae35b085fac89d1c8e9ffd63518bb 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 7f6c8ed9575251bc6f908a87a59d65eedf27bd7a..c31f598110a94da9e1f3a338a449dce30305f3ea 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 c177ea3e34892204f17706dddf8c9c13c6284ec0..c60abc5ebf54e86b05adc94b961e748b1f9bb899 100644 --- a/doc/index.html +++ b/doc/index.html @@ -52,7 +52,10 @@

ASDF stands for Another System Definition Facility, in the continuity of the Lisp DEFSYSTEM of yore.

-

asdf/driver is a Common Lisp portability library and runtime support system +

asdf/driver, + also known as uiop, + 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.

In addition to many general-purpose Lisp utilities, @@ -260,7 +263,7 @@ Peter Graves common-lisp-controller and cl-launch used to provide similar mechanisms, and have also been superseded by asdf-output-translations. -

  • asdf-bundle, née asdf-ecl, +
  • asdf-bundle, née asdf-ecl, allowed you to create a single-file bundle out of a system, for easier delivery. It is now a builtin part of asdf/defsystem, @@ -268,12 +271,14 @@ Peter Graves or (on supported implementations), a standalone executable program.
  • asdf-utils was a collection of utilities that originated with ASDF. - It is now superseded by asdf/driver, which is part of ASDF, - and exports its functionality in its own package asdf/driver. + It is now superseded by asdf/driver, aka uiop, + which is part of ASDF, + and exports its functionality + in its own package uiop.
  • asdf-condition-control, initially part of XCVB's xcvb-driver, allowed you to muffle uninteresting conditions during compilation. - Is now superseded by equivalent functionality in asdf/driver. + Is now superseded by equivalent functionality in uiop.
  • @@ -374,7 +379,7 @@ Peter Graves Common-Lisp.net button

    ASDF has an MIT style license

    -
    Last updated 2013-03-02
    +
    Last updated 2013-03-03
    diff --git a/header.lisp b/header.lisp index 4e1bbd6ac1ea3315ecd439edf1c481ccb00c9e4f..840ec9dff4f177def914f7e1ac8897f4240ed8f1 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 . diff --git a/interface.lisp b/interface.lisp index efaf66812b0f44916f5e1fb24d477cbd1da5b2f8..13e5cc2705a8aa5136318a977013d7b22ba3c3eb 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 82fe3932b0aa43d73290f8bc23a31e0b8bf8769b..de6a5e334d1ac8d98a258337555e5bf2d5505b0f 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 13e0badaa5555901312bd6d8dc438dbfef056d99..903aebcf22a4b12a993ec522169b1b9721a848ca 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 8f3aff07721b82e435208c7c00e9f46fe66b7d74..38b14b3f055f99b001aa36051a3fe8b3e07f017f 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 a1bf114d343e04c3dba54e43087ba295e40fcfb5..c6bf0d9dc69b6fc397729dad195e3fd3a0036606 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 91e6360f9a35bd6a7f4a21afa1453c01e71dd283..1a62eb1e45da2579018d8a71753f5589a258946e 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 926601f3e8549144dfb39dec1e6ce9f8b06c4444..3bd1aa95ddc22ec39745c922b745a4e7755bda8f 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 15b30f361685004a90ee3fdf3821aae794db108c..569c115f165c364e1964123f4665b455d0911664 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.31.9" +"2.31.10"