Changeset 14631

Timestamp:

02/24/14 10:48:07 (9 years ago)

Author:

Mark Evenson

Message:

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.

File:

• trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp (modified) (3 diffs)

trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp

@@ -1 +1 @@
 ;;;; 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)
@@ -15 +15 @@
   ((group-id :initarg :group-id :initform nil)
    (artifact-id :initarg :artifact-id :initform nil)
-   (repository :initform "http://repo1.maven.org/maven2/") ;;; XXX unimplmented
+   (repository :initform "http://repo1.maven.org/maven2/") ;;; XXX unimplemented
+   (resolved-classpath :initform nil :accessor resolved-classpath)
    (classname :initarg :classname :initform nil)
    (alternate-uri :initarg :alternate-uri :initform nil)
@@ -28 +29 @@
 ;;; We intercept compilation to ensure that load-op will succeed
 (defmethod perform ((op compile-op) (c mvn))
-  (abcl-asdf:resolve   
-   (ensure-parsed-mvn c)))
+  (unless (resolved-classpath c)
+    (setf (resolved-classpath c)
+          (abcl-asdf:resolve   
+           (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"