Changeset 13862

Timestamp:

02/06/12 18:20:25 (11 years ago)

Author:

Mark Evenson

Message:

Make ABCL-ASDF:SATISFY a generic function, override it to interpret mvn artifact streams.

Now something like

(satisfy "logj:log4j")

will return the necessary classpath entries to add these dependencies
specified by the Maven pom.xml graph in the hosting JVM process.

Location:

trunk/abcl/contrib/abcl-asdf

Files:

• abcl-asdf.lisp (modified) (2 diffs)
• maven-embedder.lisp (modified) (1 diff)

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

@@ -15 +15 @@
   component)
 
-;;; We interpret compilation to ensure that load-op will succeed
+;;; We intercept compilation to ensure that load-op will succeed
 (defmethod perform ((op compile-op) (c mvn))
   (maybe-parse-mvn c)
@@ -55 +55 @@
 (in-package #:abcl-asdf)
 
-(defun satisfy (mvn-component)
+(defgeneric satisfy (something)
+ :documentation "Returns a string in JVM CLASSPATH format as entries delimited by classpath separator string."
+
+(defmethod satisfy ((mvn-component asdf::mvn))
   "Resolve all runtime dependencies of MVN-COMPONENT.
 

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

@@ -369 +369 @@
 
          
+;;; "log4j:log4j:1.9.2" or "log4j:log4j"
+(defmethod satisfy ((string t))
+  (let ((result (split-string string ":")))
+    (cond 
+      ((<= 2 (length result) 3)
+       (apply #'resolve-dependencies result)))))
+