Commit 9ba4c078 authored by mevenson@1c010e3e-69d0-11dd-93a8-456734b0d56f's avatar mevenson@1c010e3e-69d0-11dd-93a8-456734b0d56f
Browse files

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".
parent 2edb39cb
......@@ -68,25 +68,24 @@
;;; The original JSS specified jar pathnames as having a NAME ending
;;; in ".jar" without a TYPE. If we encounter such a definition, we
;;; clean it up.
(defmethod perform :before ((operation load-op) (c jar-file))
(when (#"endsWith" (slot-value c 'name) ".jar")
(with-slots (name absolute-pathname) c
(defun normalize-jar-name (component)
(when (#"endsWith" (slot-value component 'name) ".jar")
(with-slots (name absolute-pathname) component
(let* ((new-name
(subseq name 0 (- (length name) 4)))
(new-absolute-pathname
(make-pathname :defaults absolute-pathname :name new-name)))
(setf name new-name
absolute-pathname new-absolute-pathname)))))
(defmethod perform :before ((operation compile-op) (c jar-file))
(normalize-jar-name c))
(defmethod perform :before ((operation load-op) (c jar-file))
(normalize-jar-name c))
(defmethod operation-done-p :before ((operation load-op) (c jar-file))
(when (#"endsWith" (slot-value c 'name) ".jar")
(with-slots (name absolute-pathname) c
(let* ((new-name
(subseq name 0 (- (length name) 4)))
(new-absolute-pathname
(make-pathname :defaults absolute-pathname :name new-name)))
(setf name new-name
absolute-pathname new-absolute-pathname)))))
(normalize-jar-name c))
(defmethod operation-done-p ((operation load-op) (c jar-file))
(or abcl-asdf:*inhibit-add-to-classpath*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment