[armedbear-cvs] r14277 - in trunk/abcl: doc/asdf src/org/armedbear/lisp
mevenson at common-lisp.net
mevenson at common-lisp.net
Mon Dec 3 00:10:02 UTC 2012
Author: mevenson
Date: Sun Dec 2 16:09:58 2012
New Revision: 14277
Log:
Sync to asdf-2.26.6.
Fixes #271.
Modified:
trunk/abcl/doc/asdf/asdf.texinfo
trunk/abcl/src/org/armedbear/lisp/asdf.lisp
Modified: trunk/abcl/doc/asdf/asdf.texinfo
==============================================================================
--- trunk/abcl/doc/asdf/asdf.texinfo Sun Dec 2 04:42:31 2012 (r14276)
+++ trunk/abcl/doc/asdf/asdf.texinfo Sun Dec 2 16:09:58 2012 (r14277)
@@ -317,9 +317,9 @@
@item
Any ASDF extension becomes invalid, and will need to be reloaded.
This applies to e.g. CFFI-Grovel, or to hacks used by ironclad, etc.
-Starting with ASDF 2.014.8, ASDF will actually invalidate
-all previously loaded systems when it is loaded on top of
-a different ASDF version.
+Starting with ASDF 2.014.8 (as far as releases go, 2.015),
+ASDF will actually invalidate all previously loaded systems
+when it is loaded on top of a different ASDF version.
@item
Until all implementations provide ASDF 2.015 or later,
it is safer if you upgrade ASDF and its extensions as a special step
@@ -341,6 +341,13 @@
(asdf:asdf-version) *required-asdf-version*))
(error "FOO requires ASDF ~A or later." *required-asdf-version*))
@end example
+ at item
+Until all implementations provide ASDF 2.27 or later,
+it is unsafe for a system to transitively depend on ASDF
+and not directly depend on ASDF;
+if any of the system you use either depends-on asdf,
+system-depends-on asdf, or transitively does,
+you should also do as well.
@end itemize
@@ -637,7 +644,8 @@
@end example
On some implementations (namely recent versions of
-ABCL, Allegro CL, Clozure CL, CMUCL, ECL, GNU CLISP, LispWorks, MKCL, SBCL and XCL),
+ABCL, Allegro CL, Clozure CL, CMUCL, ECL, GNU CLISP,
+LispWorks, MKCL, SBCL and XCL),
ASDF hooks into the @code{CL:REQUIRE} facility
and you can just use:
@@ -688,6 +696,13 @@
it must be able to find and load that system's definition.
@xref{Configuring ASDF,,Configuring ASDF to find your systems}.
+For the advanced users, note that
+ at code{require-system} calls @code{load-system}
+with keyword arguments @code{:force-not (loaded-systems)}.
+ at code{loaded-systems} returns a list of the names of loaded systems.
+ at code{load-system} applies @code{operate} with the operation from
+ at code{*load-system-operation*}, which by default is @code{load-op},
+the system, and any provided keyword arguments.
@section Summary
@@ -1309,8 +1324,8 @@
Operations are invoked on systems via @code{operate}.
@anchor{operate}
- at deffn {Generic function} @code{operate} @var{operation} @var{system} @&rest @var{initargs}
- at deffnx {Generic function} @code{oos} @var{operation} @var{system} @&rest @var{initargs}
+ at deffn {Generic function} @code{operate} @var{operation} @var{system} @&rest @var{initargs} @&key @code{force} @code{force-not} @code{verbose} @&allow-other-keys
+ at deffnx {Generic function} @code{oos} @var{operation} @var{system} @&rest @var{initargs} @&key @&allow-other-keys
@code{operate} invokes @var{operation} on @var{system}.
@code{oos} is a synonym for @code{operate}.
@@ -1325,6 +1340,16 @@
the new operations will be created
with the same @var{initargs} as the original one.
+If @var{force} is @code{t}, then all systems
+are forced to be recompiled even if not modified since last compilation.
+If @var{force} is a list, then it specifies a list of systems that
+are forced to be recompiled even if not modified since last compilation.
+If @var{force-not} is @code{t}, then all systems
+are forced not to be recompiled even if modified since last compilation.
+If @var{force-not} is a list, then it specifies a list of systems that
+are forced not to be recompiled even if modified since last compilation.
+ at var{force} takes precedences over @var{force-not};
+both of them apply to systems that are dependencies and were already compiled.
@end deffn
@menu
@@ -2886,17 +2911,25 @@
@code{nil} means the normal compile-file function will be called.
A non-nil value designates a function of one argument
that will be called with a function that
-calls the @code{*compile-op-compile-file-function*} (usually @code{compile-file*})
+calls the @code{*compile-op-compile-file-function*}
+(usually @code{compile-file*})
with proper arguments;
the around-compile hook may supply additional arguments
to pass to that @code{*compile-op-compile-file-function*}.
+
One notable argument that is heeded by @code{compile-file*} is
- at code{:compile-check}, a function called when the compilation was otherwise a success,
-with the same arguments as @code{compile-file},
-to determine whether
-(NB: The ability to pass such extra flags is only available starting with asdf 2.22.1.)
+ at code{:compile-check},
+a function called when the compilation was otherwise a success,
+with the same arguments as @code{compile-file};
+the function shall return true if the compilation
+and its resulting compiled file respected all system-specific invariants,
+and false (NIL) if it broke any of those invariants;
+it may issue warnings or errors before it returns NIL.
+(NB: The ability to pass such extra flags
+is only available starting with ASDF 2.22.3.)
+This feature is notably exercised by asdf-finalizers.
-Note that by using a string, you may reference
+By using a string, you may reference
a function, symbol and/or package
that will only be created later during the build, but
isn't yet present at the time the defsystem form is evaluated.
@@ -3241,9 +3274,9 @@
to see if the new API is present.
@emph{All} versions of ASDF should have the @code{:asdf} feature.
-Additionally, all versions of asdf 2
+Additionally, all versions of ASDF 2
define a function @code{(asdf:asdf-version)} you may use to query the version;
-and the source code of recent versions of asdf 2 features the version number
+and the source code of recent versions of ASDF 2 features the version number
prominently on the second line of its source code.
If you are experiencing problems or limitations of any sort with ASDF 1,
@@ -3462,7 +3495,8 @@
@xref{FAQ,,``How can I wholly disable the compiler output cache?''}.
@item
-Some systems in the large have been known not to play well with output translations.
+Some systems in the large have been known
+not to play well with output translations.
They were relatively easy to fix.
Once again, it is also easy to disable output translations,
or to override its configuration.
@@ -3482,9 +3516,11 @@
@itemize
@item
-ASDF pathname designators are now specified in places where they were unspecified,
+ASDF pathname designators are now specified
+in places where they were unspecified,
and a few small adjustments have to be made to some non-portable defsystems.
-Notably, in the @code{:pathname} argument to a @code{defsystem} and its components,
+Notably, in the @code{:pathname} argument
+to a @code{defsystem} and its components,
a logical pathname (or implementation-dependent hierarchical pathname)
must now be specified with @code{#p} syntax
where the namestring might have previously sufficed;
@@ -3512,20 +3548,26 @@
On Windows, only LispWorks supports proper default configuration pathnames
based on the Windows registry.
Other implementations make do with environment variables,
-that you may have to define yourself if you're using an older version of Windows.
+that you may have to define yourself
+if you're using an older version of Windows.
Windows support is somewhat less tested than Unix support.
Please help report and fix bugs.
+ at emph{Update}: As of ASDF 2.21, all implementations
+should now use the same proper default configuration pathnames
+and they should actually work, though they haven't all been tested.
@item
The mechanism by which one customizes a system so that Lisp files
may use a different extension from the default @file{.lisp} has changed.
-Previously, the pathname for a component was lazily computed when operating on a system,
+Previously, the pathname for a component
+was lazily computed when operating on a system,
and you would
@code{(defmethod source-file-type ((component cl-source-file) (system (eql (find-system 'foo))))
(declare (ignorable component system)) "lis")}.
Now, the pathname for a component is eagerly computed when defining the system,
and instead you will @code{(defclass cl-source-file.lis (cl-source-file) ((type :initform "lis")))}
-and use @code{:default-component-class cl-source-file.lis} as argument to @code{defsystem},
+and use @code{:default-component-class cl-source-file.lis}
+as argument to @code{defsystem},
as detailed in a @pxref{FAQ,How do I create a system definition where all the source files have a .cl extension?} below.
@findex source-file-type
@@ -3553,7 +3595,8 @@
it should always be a good time to upgrade to a recent ASDF.
You may consult with the maintainer for which specific version they recommend,
but the latest @code{release} should be correct.
-We trust you to thoroughly test it with your implementation before you release it.
+We trust you to thoroughly test it with your implementation
+before you release it.
If there are any issues with the current release,
it's a bug that you should report upstream and that we will fix ASAP.
@@ -3571,6 +3614,7 @@
If your system provides a mechanism to hook into @code{CL:REQUIRE},
then it would be nice to add ASDF to this hook the same way that
ABCL, CCL, CLISP, CMUCL, ECL, SBCL and SCL do it.
+Please send us appropriate code to this end.
@item
You may, like SBCL, have ASDF be implicitly used to require systems
@@ -3906,25 +3950,16 @@
Reinstate @code{parse-option} or something akin.
-** document all the error classes
-
-** what to do with compile-file failure
-
-Should check the primary return value from compile-file and see if
-that gets us any closer to a sensible error handling strategy
-
-** foreign files
-
-lift unix-dso stuff from db-sockets
-
** Diagnostics
A ``dry run'' of an operation can be made with the following form:
@lisp
-(traverse (make-instance '<operation-name>)
- (find-system <system-name>)
- 'explain)
+(let ((asdf::*verbose-out* *standard-output*))
+ (loop :for (op . comp) :in
+ (asdf::traverse (make-instance '<operation-name> :force t)
+ (asdf:find-system <system-name>))
+ :do (asdf:explain op comp)))
@end lisp
This uses unexported symbols.
@@ -3934,13 +3969,9 @@
** reuse the same scratch package whenever a system is reloaded from disk
-** proclamations probably aren't
+Have a package ASDF-USER instead of all these temporary packages?
-** when a system is reloaded with fewer components than it previously had, odd things happen
-
-We should do something inventive when processing a @code{defsystem} form,
-like take the list of kids and @code{setf} the slot to @code{nil},
-then transfer children from old to new list as they're found.
+** proclamations probably aren't
** (stuff that might happen later)
@@ -3950,9 +3981,11 @@
@code{(asdf:compile-system :araneida :force t)}
-also forces compilation of every other system the @code{:araneida} system depends on.
+also forces compilation of every other system
+the @code{:araneida} system depends on.
This is rarely useful to me;
-usually, when I want to force recompilation of something more than a single source file,
+usually, when I want to force recompilation
+of something more than a single source file,
I want to recompile only one system.
So it would be more useful to have @code{make-sub-operation}
refuse to propagate @code{:force t} to other systems, and
Modified: trunk/abcl/src/org/armedbear/lisp/asdf.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/asdf.lisp Sun Dec 2 04:42:31 2012 (r14276)
+++ trunk/abcl/src/org/armedbear/lisp/asdf.lisp Sun Dec 2 16:09:58 2012 (r14277)
@@ -1,5 +1,5 @@
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
-;;; This is ASDF 2.26: Another System Definition Facility.
+;;; This is ASDF 2.26.6: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel at common-lisp.net>.
@@ -118,7 +118,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")
+ (asdf-version "2.26.6")
(existing-asdf (find-class 'component nil))
(existing-version *asdf-version*)
(already-there (equal asdf-version existing-version)))
@@ -215,10 +215,10 @@
(ensure-package (name &key nicknames use unintern
shadow export redefined-functions)
(let* ((p (ensure-exists name nicknames use)))
- (ensure-unintern p (append unintern #+cmu redefined-functions))
+ (ensure-unintern p unintern)
(ensure-shadow p shadow)
(ensure-export p export)
- #-cmu (ensure-fmakunbound p redefined-functions)
+ (ensure-fmakunbound p redefined-functions)
p)))
(macrolet
((pkgdcl (name &key nicknames use export
@@ -411,7 +411,7 @@
Valid values are :error, :warn, and :ignore.")
(defvar *compile-file-failure-behaviour*
- (or #+sbcl :error #+clisp :ignore :warn)
+ (or #+(or mkcl sbcl) :error #+clisp :ignore :warn)
"How should ASDF react if it encounters a failure (per the ANSI spec of COMPILE-FILE)
when compiling a file? Valid values are :error, :warn, and :ignore.
Note that ASDF ALWAYS raises an error if it fails to create an output file when compiling.")
@@ -1212,8 +1212,8 @@
((component :reader error-component :initarg :component)
(operation :reader error-operation :initarg :operation))
(:report (lambda (c s)
- (format s (compatfmt "~@<Error while invoking ~A on ~A~@:>")
- (error-operation c) (error-component c)))))
+ (format s (compatfmt "~@<~A while invoking ~A on ~A~@:>")
+ (type-of c) (error-operation c) (error-component c)))))
(define-condition compile-error (operation-error) ())
(define-condition compile-failed (compile-error) ())
(define-condition compile-warned (compile-error) ())
@@ -1461,8 +1461,7 @@
(maintainer :accessor system-maintainer :initarg :maintainer)
(licence :accessor system-licence :initarg :licence
:accessor system-license :initarg :license)
- (source-file :reader %system-source-file :initarg :source-file ; for CLISP upgrade
- :writer %set-system-source-file)
+ (source-file :initarg :source-file :writer %set-system-source-file) ; upgrade issues on CLISP, CMUCL
(defsystem-depends-on :reader system-defsystem-depends-on :initarg :defsystem-depends-on)))
;;;; -------------------------------------------------------------------------
@@ -1636,12 +1635,8 @@
FN should be a function of one argument. It will be
called with an object of type asdf:system."
- (maphash #'(lambda (_ datum)
- (declare (ignore _))
- (destructuring-bind (_ . def) datum
- (declare (ignore _))
- (funcall fn def)))
- *defined-systems*))
+ (loop :for (nil . system) :being :the hash-values :of *defined-systems*
+ :do (funcall fn system)))
;;; for the sake of keeping things reasonably neat, we adopt a
;;; convention that functions in this list are prefixed SYSDEF-
@@ -1795,6 +1790,8 @@
(defvar *systems-being-defined* nil
"A hash-table of systems currently being defined keyed by name, or NIL")
+(defvar *systems-being-operated* nil
+ "A boolean indicating that some systems are being operated on")
(defun* find-system-if-being-defined (name)
(when *systems-being-defined*
@@ -2004,10 +2001,10 @@
;; the &allow-other-keys disables initarg validity checking
(declare (ignorable operation slot-names force force-not))
(macrolet ((frob (x) ;; normalize forced and forced-not slots
- `(when (consp (,x operation))
- (setf (,x operation)
- (mapcar #'coerce-name (,x operation))))))
- (frob operation-forced) (frob operation-forced-not))
+ `(when (consp (slot-value operation ',x))
+ (setf (slot-value operation ',x)
+ (mapcar #'coerce-name (slot-value operation ',x))))))
+ (frob forced) (frob forced-not))
(values))
(defun* node-for (o c)
@@ -2357,7 +2354,7 @@
(r* (svref x 0))
(c x)))
(r* (l)
- (dolist (x l) (r x))))
+ (map () #'r l)))
(r* l))))
(defmethod traverse ((operation operation) (c component))
@@ -2458,11 +2455,11 @@
(let ((*package* (find-package package)))
(read-from-string fun))))))))
-(defmethod call-with-around-compile-hook ((c component) thunk)
- (let ((hook (around-compile-hook c)))
- (if hook
- (funcall (ensure-function hook) thunk)
- (funcall thunk))))
+(defun call-around-hook (hook function)
+ (funcall (or (ensure-function hook) 'funcall) function))
+
+(defmethod call-with-around-compile-hook ((c component) function)
+ (call-around-hook (around-compile-hook c) function))
;;; perform is required to check output-files to find out where to put
;;; its answers, in case it has been overridden for site policy
@@ -2618,10 +2615,9 @@
(defmethod operation-done-p ((o load-source-op) (c source-file))
(declare (ignorable o))
- (if (or (not (component-property c 'last-loaded-as-source))
- (> (safe-file-write-date (component-pathname c))
- (component-property c 'last-loaded-as-source)))
- nil t))
+ (and (component-property c 'last-loaded-as-source)
+ (<= (safe-file-write-date (component-pathname c))
+ (component-property c 'last-loaded-as-source))))
(defmethod operation-description ((operation load-source-op) component)
(declare (ignorable operation))
@@ -2657,6 +2653,7 @@
(defgeneric* operate (operation-class system &key &allow-other-keys))
(defgeneric* perform-plan (plan &key))
+(defgeneric* plan-operates-on-p (plan component))
;;;; Separating this into a different function makes it more forward-compatible
(defun* cleanup-upgraded-asdf (old-version)
@@ -2691,6 +2688,10 @@
(operate 'load-op :asdf :verbose nil))
(cleanup-upgraded-asdf version)))
+(defmethod plan-operates-on-p ((plan list) (component-path list))
+ (find component-path (mapcar 'cdr plan)
+ :test 'equal :key 'component-find-path))
+
(defmethod perform-plan ((steps list) &key)
(let ((*package* *package*)
(*readtable* *readtable*))
@@ -2699,38 +2700,44 @@
(perform-with-restarts op component)))))
(defmethod operate (operation-class system &rest args
- &key ((:verbose *asdf-verbose*) *asdf-verbose*) version force
- &allow-other-keys)
- (declare (ignore force))
+ &key force force-not verbose version &allow-other-keys)
+ (declare (ignore force force-not))
(with-system-definitions ()
- (let* ((op (apply 'make-instance operation-class
- :original-initargs args
- args))
- (*verbose-out* (if *asdf-verbose* *standard-output* (make-broadcast-stream)))
+ (let* ((*asdf-verbose* verbose)
+ (*verbose-out* (if verbose *standard-output* (make-broadcast-stream)))
+ (op (apply 'make-instance operation-class
+ :original-initargs args args))
(system (etypecase system
(system system)
- ((or string symbol) (find-system system)))))
- (unless (version-satisfies system version)
- (error 'missing-component-of-version :requires system :version version))
- (let ((steps (traverse op system)))
- (when (and (not (equal '("asdf") (component-find-path system)))
- (find '("asdf") (mapcar 'cdr steps)
- :test 'equal :key 'component-find-path)
- (upgrade-asdf))
- ;; If we needed to upgrade ASDF to achieve our goal,
- ;; then do it specially as the first thing, then
- ;; invalidate all existing system
- ;; retry the whole thing with the new OPERATE function,
- ;; which on some implementations
- ;; has a new symbol shadowing the current one.
- (return-from operate
- (apply (find-symbol* 'operate :asdf) operation-class system args)))
- (perform-plan steps)
- (values op steps)))))
-
-(defun* oos (operation-class system &rest args &key force verbose version
- &allow-other-keys)
- (declare (ignore force verbose version))
+ ((or string symbol) (find-system system))))
+ (systems-being-operated *systems-being-operated*)
+ (*systems-being-operated* (or systems-being-operated (make-hash-table :test 'equal))))
+ (check-type system system)
+ (setf (gethash (coerce-name system) *systems-being-operated*) system)
+ (flet ((upgrade ()
+ ;; If we needed to upgrade ASDF to achieve our goal,
+ ;; then do it specially as the first thing,
+ ;; which will invalidate all existing systems;
+ ;; afterwards, retry the whole thing with the new OPERATE function,
+ ;; which on some implementations
+ ;; has a new symbol shadowing the current one.
+ (unless (gethash "asdf" *systems-being-operated*)
+ (upgrade-asdf)
+ (return-from operate
+ (apply (find-symbol* 'operate :asdf) operation-class system args)))))
+ (when systems-being-operated ;; Upgrade if loading a system from another one.
+ (upgrade))
+ (unless (version-satisfies system version)
+ (error 'missing-component-of-version :requires system :version version))
+ (let ((plan (traverse op system)))
+ (when (plan-operates-on-p plan '("asdf"))
+ (upgrade)) ;; Upgrade early if the plan involves upgrading asdf at any time.
+ (perform-plan plan)
+ (values op plan))))))
+
+(defun* oos (operation-class system &rest args
+ &key force force-not verbose version &allow-other-keys)
+ (declare (ignore force force-not verbose version))
(apply 'operate operation-class system args))
(let ((operate-docstring
@@ -3183,11 +3190,11 @@
(unless (slot-boundp system 'source-file)
(%set-system-source-file
(probe-asd (component-name system) (component-pathname system)) system))
- (%system-source-file system))
+ (slot-value system 'source-file))
(defmethod system-source-file ((system-name string))
- (%system-source-file (find-system system-name)))
+ (system-source-file (find-system system-name)))
(defmethod system-source-file ((system-name symbol))
- (%system-source-file (find-system system-name)))
+ (system-source-file (find-system system-name)))
(defun* system-source-directory (system-designator)
"Return a pathname object corresponding to the
@@ -3918,9 +3925,7 @@
(if output-file keys (remove-keyword :output-file keys))))))
(defun* tmpize-pathname (x)
- (make-pathname
- :name (strcat "ASDF-TMP-" (pathname-name x))
- :defaults x))
+ (make-pathname :name (strcat "ASDF-TMP-" (pathname-name x)) :defaults x))
(defun* delete-file-if-exists (x)
(when (and x (probe-file* x))
@@ -3955,38 +3960,32 @@
(setf output-truename nil failure-p t)))
(values output-truename warnings-p failure-p))))
-#+abcl
+#+abcl
(defun* translate-jar-pathname (source wildcard)
(declare (ignore wildcard))
- (let* ((jar
- (pathname (first (pathname-device source))))
- (target-root-directory-namestring
- (format nil "/___jar___file___root___/~@[~A/~]"
- (and (find :windows *features*)
- (pathname-device jar))))
- (relative-source
- (relativize-pathname-directory source))
- (relative-jar
- (relativize-pathname-directory (ensure-directory-pathname jar)))
- (target-root-directory
- (if (find :windows *features*)
- (make-pathname :name nil
- :type nil
- :version nil
- :defaults (parse-namestring target-root-directory-namestring))
- (make-pathname :device :unspecific
- :name nil
- :type nil
- :version nil
- :defaults (parse-namestring target-root-directory-namestring))))
- (target-root
- (merge-pathnames* relative-jar target-root-directory))
- (target
- (merge-pathnames* relative-source target-root)))
- (if (find :windows *features*)
- (apply-output-translations target)
- (make-pathname :defaults (apply-output-translations target)
- :device :unspecific))))
+ (flet ((normalize-device (pathname)
+ (if (find :windows *features*)
+ pathname
+ (make-pathname :defaults pathname :device :unspecific))))
+ (let* ((jar
+ (pathname (first (pathname-device source))))
+ (target-root-directory-namestring
+ (format nil "/___jar___file___root___/~@[~A/~]"
+ (and (find :windows *features*)
+ (pathname-device jar))))
+ (relative-source
+ (relativize-pathname-directory source))
+ (relative-jar
+ (relativize-pathname-directory (ensure-directory-pathname jar)))
+ (target-root-directory
+ (normalize-device
+ (pathname-directory-pathname
+ (parse-namestring target-root-directory-namestring))))
+ (target-root
+ (merge-pathnames* relative-jar target-root-directory))
+ (target
+ (merge-pathnames* relative-source target-root)))
+ (normalize-device (apply-output-translations target)))))
;;;; -----------------------------------------------------------------
;;;; Compatibility mode for ASDF-Binary-Locations
@@ -4154,9 +4153,7 @@
(collect-sub*directories subdir collectp recursep collector))))
(defun* collect-sub*directories-asd-files
- (directory &key
- (exclude *default-source-registry-exclusions*)
- collect)
+ (directory &key (exclude *default-source-registry-exclusions*) collect)
(collect-sub*directories
directory
(constantly t)
@@ -4508,19 +4505,16 @@
(asdf-message ";; ASDF, version ~a~%" (asdf-version)))
#+mkcl
-(progn
- (defvar *loading-asdf-bundle* nil)
- (unless *loading-asdf-bundle*
- (let ((*central-registry*
- (cons (translate-logical-pathname #P"CONTRIB:asdf-bundle;") *central-registry*))
- (*loading-asdf-bundle* t))
- (clear-system :asdf-bundle) ;; we hope to force a reload.
- (multiple-value-bind (result bundling-error)
- (ignore-errors (asdf:oos 'asdf:load-op :asdf-bundle))
- (unless result
- (format *error-output*
- "~&;;; ASDF: Failed to load package 'asdf-bundle'!~%;;; ASDF: Reason is: ~A.~%"
- bundling-error))))))
+(handler-case
+ (progn
+ (load-sysdef "asdf-bundle"
+ (subpathname (translate-logical-pathname #P"CONTRIB:")
+ "asdf-bundle/asdf-bundle.asd"))
+ (load-system "asdf-bundle"))
+ (error (e)
+ (format *error-output*
+ "~&;;; ASDF: Failed to load package 'asdf-bundle'!~%;;; ~A~%"
+ e)))
#+allegro
(eval-when (:compile-toplevel :execute)
More information about the armedbear-cvs
mailing list