2.26.138: remove duplicate definition of TRAVERSE.

Some doc & test frobbing.

diff --git a/asdf.asd b/asdf.asd
index 78fd66b..63bb29b 100644 (file)
--- a/asdf.asd
+++ b/asdf.asd
@@ -15,7 +15,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.26.137" ;; to be automatically updated by make bump-version
+  :version "2.26.138" ;; to be automatically updated by make bump-version
   :depends-on ()
   :components ((:module "build" :components ((:file "asdf"))))
   :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op asdf/defsystem))))

diff --git a/doc/asdf.texinfo b/doc/asdf.texinfo
index 100b3c3..3d1a902 100644 (file)
--- a/doc/asdf.texinfo
+++ b/doc/asdf.texinfo
@@ -262,15 +262,18 @@ or none at all:
 
 @lisp
 (when (find-package :asdf)
-  (or (symbol-value (or (find-symbol (string :*asdf-version*) :asdf)
-                        (find-symbol (string :*asdf-revision*) :asdf)))
-      :antique))
+  (let ((ver (symbol-value (or (find-symbol (string :*asdf-version*) :asdf)
+                               (find-symbol (string :*asdf-revision*) :asdf)))))
+    (etypecase ver
+      (string ver)
+      (cons (format nil "~{~D~^.~}" ver))
+      (null "1.0"))))
 @end lisp
 
-If it returns a version number as a string, that's the version of ASDF installed.
-If it returns a version number as a list, that's an old CVS version from before 1.365.
-If it returns the keyword @code{:ANTIQUE}, it's so old that's not funny.
 If it returns @code{NIL} then ASDF is not installed.
+Otherwise it should return a string.
+If it returns @code{"1.0"}, then it can actually be
+any version before 1.77 or so, or some buggy variant of 1.x.
 
 If you are experiencing problems with ASDF,
 please try upgrading to the latest released version,

diff --git a/header.lisp b/header.lisp
index a9cd15c..b9b497e 100644 (file)
--- a/header.lisp
+++ b/header.lisp
@@ -1,5 +1,5 @@
 ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
-;;; This is ASDF 2.26.137: Another System Definition Facility.
+;;; This is ASDF 2.26.138: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.

diff --git a/plan.lisp b/plan.lisp
index 2b0ee92..9920b1e 100644 (file)
--- a/plan.lisp
+++ b/plan.lisp
@@ -363,10 +363,10 @@ the action of OPERATION on COMPONENT in the PLAN"))
 The plan returned is a list of dotted-pairs. Each pair is the CONS
 of ASDF operation object and a COMPONENT object. The pairs will be
 processed in order by OPERATE."))
+(define-convenience-action-methods traverse (operation component &key))
+
 (defgeneric* perform-plan (plan &key))
 (defgeneric* plan-operates-on-p (plan component))
-(defgeneric* (traverse) (operation component &key &allow-other-keys))
-(define-convenience-action-methods traverse (operation component &key))
 
 (defparameter *default-plan-class* 'sequential-plan)
 

diff --git a/test/script-support.lisp b/test/script-support.lisp
index 9728b1f..859953d 100644 (file)
--- a/test/script-support.lisp
+++ b/test/script-support.lisp
@@ -356,9 +356,13 @@ is bound, write a message and exit on an error.  If
 
 (defun get-asdf-version ()
   (when (find-package :asdf)
-    (or (symbol-value (or (find-symbol (string :*asdf-version*) :asdf)
-                          (find-symbol (string :*asdf-revision*) :asdf)))
-        (string :1.x))))
+    (let ((ver (symbol-value (or (find-symbol (string :*asdf-version*) :asdf)
+                                 (find-symbol (string :*asdf-revision*) :asdf)))))
+      (typecase ver
+        (string ver)
+        (cons (format nil "~{~D~^.~}" ver))
+        (null "1.0")))))
+
 
 (defun test-upgrade (old-method new-method tag) ;; called by run-test
   (with-test ()

diff --git a/test/test-run-program.script b/test/test-run-program.script
index 9ebf51b..c8d03cb 100644 (file)
--- a/test/test-run-program.script
+++ b/test/test-run-program.script
@@ -16,6 +16,8 @@
   ;; NB2: we do NOT support stderr capture to *verbose-out* anymore in run-shell-command.
   ;; If you want 2>&1 redirection, you know where to find it.
   (assert-equal '("ok 1") (run-program "echo ok  1" :output :lines))
-  (assert-equal '("ok  1") (run-program '("echo" "ok  1") :output :lines))
+  (assert-equal "ok  1" (run-program '("echo" "ok  1") :output :line))
+  (assert-equal '(:ok 1) (run-program '("echo" ":ok  1") :output :forms))
+  (assert-equal (format nil "ok  1~%") (run-program '("echo" "ok  1") :output :string))
 
   t)

diff --git a/upgrade.lisp b/upgrade.lisp
index b9e3a15..3dd2624 100644 (file)
--- 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.137")
+         (asdf-version "2.26.138")
          (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 3fb3250..3833055 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.26.137"
+"2.26.138"