[armedbear-cvs] r13318 - trunk/abcl/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Fri Jun 10 01:37:39 2011
New Revision: 13318

Log:
Update to asdf-2.016.1 to align with upstream ASDF.

Fare patched the problems with compiling files with jars in a non-ABCL
specific manner in COMPILE-FILE-PATHNAME*.

Modified:
   trunk/abcl/src/org/armedbear/lisp/asdf.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/asdf.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/asdf.lisp	Thu Jun  9 08:24:31 2011	(r13317)
+++ trunk/abcl/src/org/armedbear/lisp/asdf.lisp	Fri Jun 10 01:37:39 2011	(r13318)
@@ -3526,13 +3526,13 @@
       ;;; If the default ABCL rules for translating from a jar path to
       ;;; a non-jar path have been affected, no further computation of
       ;;; the output location is necessary.
-      (if (and (find :abcl *features*)
-               (pathname-device input-file) ; input-file is in a jar
-               (not (pathname-device output-file)) ; output-file is not in a jar
-               (equal (pathname-type input-file) "lisp")
-               (equal (pathname-type output-file) "abcl"))
-          output-file
-          (apply 'compile-file-pathname (lispize-pathname input-file) keys))
+      ;; (if (and (find :abcl *features*)
+      ;;          (pathname-device input-file) ; input-file is in a jar
+      ;;          (not (pathname-device output-file)) ; output-file is not in a jar
+      ;;          (equal (pathname-type input-file) "lisp")
+      ;;          (equal (pathname-type output-file) "abcl"))
+      ;;     output-file
+          (apply 'compile-file-pathname (lispize-pathname input-file) keys);)
       (apply-output-translations
        (apply 'compile-file-pathname
               (truenamize (lispize-pathname input-file))