Commit 90f3c593 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Bump version after merge.

Merge branches 'master' and 'release' of http://common-lisp.net/project/asdf/asdf

Conflicts:
	asdf.lisp
Loading
Loading
Loading
Loading
+7 −13
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@
  (defvar *asdf-version* nil)
  (defvar *upgraded-p* nil)
  (let* ((asdf-version ;; the 1+ helps the version bumping script discriminate
          (subseq "VERSION:2.130" (1+ (length "VERSION"))))
          (subseq "VERSION:2.131" (1+ (length "VERSION"))))
         (existing-asdf (fboundp 'find-system))
         (existing-version *asdf-version*)
         (already-there (equal asdf-version existing-version)))
@@ -962,15 +962,13 @@ with given pathname and if it exists return its truename."
;;;; methods: components

(defmethod print-object ((c missing-component) s)
  (format s "~@<component ~S not found~
             ~@[ in ~A~]~@:>"
  (format s "~@<component ~S not found~@[ in ~A~]~@:>"
          (missing-requires c)
          (when (missing-parent c)
            (component-name (missing-parent c)))))

(defmethod print-object ((c missing-component-of-version) s)
  (format s "~@<component ~S does not match version ~A~
              ~@[ in ~A~]~@:>"
  (format s "~@<component ~S does not match version ~A~@[ in ~A~]~@:>"
          (missing-requires c)
          (missing-version c)
          (when (missing-parent c)
@@ -1194,8 +1192,7 @@ Going forward, we recommend new users should be using the source-registry.
                            (let* ((*print-circle* nil)
                                   (message
                                    (format nil
                                            "~@<While searching for system ~S: ~S evaluated ~
to ~S which is not a directory.~@:>"
                                            "~@<While searching for system ~S: ~S evaluated to ~S which is not a directory.~@:>"
                                            system dir defaults)))
                              (error message))
                          (remove-entry-from-registry ()
@@ -1781,8 +1778,7 @@ recursive calls to traverse.")

(defmethod perform ((operation operation) (c source-file))
  (sysdef-error
   "~@<required method PERFORM not implemented ~
    for operation ~A, component ~A~@:>"
   "~@<required method PERFORM not implemented for operation ~A, component ~A~@:>"
   (class-of operation) (class-of c)))

(defmethod perform ((operation operation) (c module))
@@ -2062,8 +2058,7 @@ recursive calls to traverse.")
              (accept ()
                :report
                (lambda (s)
                  (format s "~@<Continue, treating ~A as ~
                                   having been successful.~@:>"
                  (format s "~@<Continue, treating ~A as having been successful.~@:>"
                          (operation-description op component)))
                (setf (gethash (type-of op)
                               (component-operation-times component))
@@ -2539,8 +2534,7 @@ located."
                            "No architecture feature found in ~a."
                            *architecture-features*))
          (version (maybe-warn (lisp-version-string)
                               "Don't know how to get Lisp ~
                                          implementation version.")))
                               "Don't know how to get Lisp implementation version.")))
      (substitute-if
       #\_ (lambda (x) (find x " /:\\(){}[]$#`'\""))
       (format nil "~(~@{~a~^-~}~)" lisp version os arch)))))
+31 −12
Original line number Diff line number Diff line
cl-asdf (2:2.008-1) unstable; urgency=low

  * new upstream: removes unwanted exports,
    plays nicer with sbcl, cmucl, old clisp.

 -- Francois-Rene Rideau <fare@tunes.org>  Fri, 10 Sep 2010 17:16:06 -0400

cl-asdf (2:2.007-1) unstable; urgency=low

  * new upstream, fixes lp#623992 introduced in 2.006, allows upgrade on SBCL.

 -- Francois-Rene Rideau <fare@tunes.org>  Wed, 25 Aug 2010 23:22:13 -0400

cl-asdf (2:2.006-1) unstable; urgency=low

  * new upstream, with bug fixes and API changes.

 -- Francois-Rene Rideau <fare@tunes.org>  Tue, 24 Aug 2010 18:43:48 -0400

cl-asdf (2:2.005-1) unstable; urgency=low

  * New upstream.
+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ usage () {
    echo " - quit with exit status 0 on getting eof"
    echo " - quit with exit status >0 if an unhandled error occurs"
    echo " you need to supply the .script in the second argument"
    echo " lisps include sbcl, clisp, allegro and allegromodern"
    echo " lisps include sbcl, clisp, cmucl, lispworks, clisp, allegro and allegromodern"
    echo "OPTIONS:"
    echo "    -d -- debug mode"
    echo "    -u -h -- show this message."