1.101: handle enough-component-spec correctly.
authorFrancois-Rene Rideau <fare@tunes.org>
Fri, 16 Apr 2010 02:43:11 +0000 (22:43 -0400)
committerFrancois-Rene Rideau <fare@tunes.org>
Fri, 16 Apr 2010 02:43:11 +0000 (22:43 -0400)
grovel.lisp
package.lisp

index fb90f98..799dc9e 100644 (file)
   (let ((pn (enough-namestring (normalize-pathname-directory
                                 (asdf:component-pathname c))))
         (type (asdf:source-file-type c (asdf:component-system c))))
-    (values (strip-extension pn type) pn)))
+    (values (strip-extension pn type) pn type)))
 
-(defun enough-component-spec (c &optional pn-p)
-  (multiple-value-bind (name pn) (normalized-component-name c)
-    (write-to-string name)))
+(defun enough-component-spec (c)
+  (multiple-value-bind (name pn type) (normalized-component-name c)
+    (if (or (null type) (equal (concatenate 'string name "." type) pn))
+        (write-to-string name)
+        (format nil "~S :pathname #p~S" name pn))))
 
 ;; Used by additional-dependencies* and overridden-dependencies*.
 (defun map-over-instrumented-component-and-parents (component slot-name)
                (slot-value component 'translated-name))
               (and include-pathname
                    (slot-value component 'translated-pathname)))
-      (enough-component-spec component include-pathname)))
+      (enough-component-spec component)))
 
 ;; Used only by maybe-translated-component-class.
 (defun coerce-name (maybe-class)
index 34e44af..2048454 100644 (file)
@@ -31,7 +31,7 @@
 
 (in-package #:asdf-dependency-grovel)
 
-(defparameter *asdf-dependency-grovel-version* "1.100")
+(defparameter *asdf-dependency-grovel-version* "1.101")
 (defparameter *asdf-version-required-by-adg* "1.702")
 
 #-asdf2