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

abcl-asdf: cache Maven dependency resolution to avoid repeated lookups.

Instead of calling ABCL-ASDF:RESOLVE in both the ASDF COMPILE-OP and
LOAD-OP, we now cache the result of invocation in COMPILE-OP and add
this value in the LOAD-OP phase.

Contributed by Cyrus Harmon.
parent 747abf59
;;;; The ABCL specific overrides in ASDF.
;;;; Done separate from asdf.lisp for stability.
;;;; Done separately from asdf.lisp for stability.
(require :asdf)
(in-package :asdf)
......@@ -14,7 +14,8 @@
(defclass mvn (iri)
((group-id :initarg :group-id :initform nil)
(artifact-id :initarg :artifact-id :initform nil)
(repository :initform "") ;;; XXX unimplmented
(repository :initform "") ;;; XXX unimplemented
(resolved-classpath :initform nil :accessor resolved-classpath)
(classname :initarg :classname :initform nil)
(alternate-uri :initarg :alternate-uri :initform nil)
;; inherited from ASDF:COMPONENT ??? what are the CL semantics on overriding -- ME 2012-04-01
......@@ -27,14 +28,15 @@
;;; We intercept compilation to ensure that load-op will succeed
(defmethod perform ((op compile-op) (c mvn))
(ensure-parsed-mvn c)))
(unless (resolved-classpath c)
(setf (resolved-classpath c)
(ensure-parsed-mvn c)))))
(defmethod perform ((operation load-op) (c mvn))
(let ((resolved-path
(abcl-asdf:resolve (ensure-parsed-mvn c))))
(when (stringp resolved-path)
(java:add-to-classpath (abcl-asdf:as-classpath resolved-path)))))
(let ((resolved-classpath (resolved-classpath c)))
(when (stringp resolved-classpath)
(java:add-to-classpath (abcl-asdf:as-classpath resolved-classpath)))))
;;; A Maven URI has the form "mvn:group-id/artifact-id/version"
Supports Markdown
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