Changeset 14590


Ignore:
Timestamp:
12/05/13 22:09:20 (9 years ago)
Author:
Mark Evenson
Message:

Extend ABCL-ASDF:JAR-FILE pathname normalization to ASDF:COMPILE-OP.

Fixes loading of the lsw2 util system by normalizing
ABCL-ASDF:JAR-FILE components whose pathname NAME component ends in
".jar".

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/contrib/abcl-asdf/asdf-jar.lisp

    r13432 r14590  
    6969;;; in ".jar" without a TYPE.  If we encounter such a definition, we
    7070;;; clean it up.
    71 (defmethod perform :before ((operation load-op) (c jar-file))
    72   (when (#"endsWith" (slot-value c 'name) ".jar")
    73     (with-slots (name absolute-pathname) c
     71(defun normalize-jar-name (component)
     72  (when (#"endsWith" (slot-value component 'name) ".jar")
     73    (with-slots (name absolute-pathname) component
    7474      (let* ((new-name
    7575              (subseq name 0 (- (length name) 4)))
     
    7878        (setf name new-name
    7979              absolute-pathname new-absolute-pathname)))))
     80 
     81(defmethod perform :before ((operation compile-op) (c jar-file))
     82  (normalize-jar-name c))
     83 
     84(defmethod perform :before ((operation load-op) (c jar-file))
     85  (normalize-jar-name c))
    8086
    8187(defmethod operation-done-p :before ((operation load-op) (c jar-file))
    82   (when (#"endsWith" (slot-value c 'name) ".jar")
    83     (with-slots (name absolute-pathname) c
    84       (let* ((new-name
    85               (subseq name 0 (- (length name) 4)))
    86              (new-absolute-pathname
    87               (make-pathname :defaults absolute-pathname :name new-name)))
    88         (setf name new-name
    89               absolute-pathname new-absolute-pathname)))))
     88  (normalize-jar-name c))
    9089
    9190(defmethod operation-done-p ((operation load-op) (c jar-file))
Note: See TracChangeset for help on using the changeset viewer.