Changeset 13318

Timestamp:

06/10/11 08:37:39 (13 years ago)

Author:

Mark Evenson

Message:

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*.

File:

• trunk/abcl/src/org/armedbear/lisp/asdf.lisp (modified) (1 diff)

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

@@ -3527 +3527 @@
       ;;; 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