Changeset 14743

Timestamp:

01/05/15 17:36:00 (8 years ago)

Author:

Mark Evenson

Message:

abcl-asdf: enhancements

• mvn class now has :repository initarg

• only add the repository to *mvn-repositories* if non-null

• use the components repsoitory slot in resolve

• fix resolve-dependencies call to use keyword args for version and repsoitory

Location:

trunk/abcl/contrib/abcl-asdf

Files:

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

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

@@ -15 +15 @@
   ((group-id :initarg :group-id :initform nil)
    (artifact-id :initarg :artifact-id :initform nil)
-   (repository :initform "http://repo1.maven.org/maven2/") ;;; XXX unimplemented
+   (repository :initarg :repository :initform "http://repo1.maven.org/maven2/") ;;; XXX unimplemented
    (resolved-classpath :initform nil :accessor resolved-classpath)
    (classname :initarg :classname :initform nil)
@@ -83 +83 @@
                       name version)))
         (setf schema "mvn")
-        (pushnew repository *mvn-repositories*)
+        (when repository
+          (pushnew repository *mvn-repositories*))
         ;;; Always set path to normalized path "on the way out" to
         ;;; contain group-id/artifact-id/version
@@ -118 +119 @@
         (classname (slot-value mvn-component 'asdf::classname))
         (alternate-uri (slot-value mvn-component 'asdf::alternate-uri))
+        (repository (slot-value mvn-component 'asdf::repository))
         (version (if (slot-value mvn-component 'asdf::version)
                      (slot-value mvn-component 'asdf::version)
@@ -132 +134 @@
           (error "Unexpected Java exception~&~A.~&" e))))
     (if (find-mvn)
-        (resolve-dependencies group-id artifact-id version)
+        (resolve-dependencies group-id artifact-id
+                              :version version
+                              :repository repository)
         (if alternate-uri
             (values (namestring alternate-uri) alternate-uri) 

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

@@ -444 +444 @@
          (collect-request (java:jnew (jss:find-java-class "CollectRequest"))))
     (#"setRoot" collect-request dependency)
-    (#"addRepository" collect-request 
-                      (if repository-p
-                          (ensure-remote-repository :repository repository)
-                          (ensure-remote-repository)))
+    (when repository
+      (#"addRepository" collect-request 
+                        (if repository-p
+                            (ensure-remote-repository :repository repository)
+                            (ensure-remote-repository))))
     (let* ((node 
             (#"getRoot" (#"collectDependencies" (ensure-repository-system) (ensure-session) collect-request)))