Changeset 13315 for trunk/abcl/src/org


Ignore:
Timestamp:
06/09/11 13:01:16 (10 years ago)
Author:
Mark Evenson
Message:

Fix ASDF working with jar archives.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/asdf.lisp

    r13311 r13315  
    21362136;;; perform is required to check output-files to find out where to put
    21372137;;; its answers, in case it has been overridden for site policy
     2138(defvar *debug-perform-compile-op* nil)
    21382139(defmethod perform ((operation compile-op) (c cl-source-file))
     2140  (push (list operation c) *debug-perform-compile-op*)
    21392141  #-:broken-fasl-loader
    21402142  (let ((source-file (component-pathname c))
     
    35243526(defun* compile-file-pathname* (input-file &rest keys &key output-file &allow-other-keys)
    35253527  (if (absolute-pathname-p output-file)
    3526       (apply 'compile-file-pathname (lispize-pathname input-file) keys)
     3528      ;;; If the default ABCL rules for translating from a jar path to
     3529      ;;; a non-jar path have been affected, no further computation of
     3530      ;;; the output location is necessary.
     3531      (if (and (find :abcl *features*)
     3532               (pathname-device input-file) ; input-file is in a jar
     3533               (not (pathname-device output-file)) ; output-file is not in a jar
     3534               (equal (pathname-type input-file) "lisp")
     3535               (equal (pathname-type output-file) "abcl"))
     3536          output-file
     3537          (apply 'compile-file-pathname (lispize-pathname input-file) keys))
    35273538      (apply-output-translations
    35283539       (apply 'compile-file-pathname
Note: See TracChangeset for help on using the changeset viewer.