Changeset 14743


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp

    r14742 r14743  
    1515  ((group-id :initarg :group-id :initform nil)
    1616   (artifact-id :initarg :artifact-id :initform nil)
    17    (repository :initform "http://repo1.maven.org/maven2/") ;;; XXX unimplemented
     17   (repository :initarg :repository :initform "http://repo1.maven.org/maven2/") ;;; XXX unimplemented
    1818   (resolved-classpath :initform nil :accessor resolved-classpath)
    1919   (classname :initarg :classname :initform nil)
     
    8383                      name version)))
    8484        (setf schema "mvn")
    85         (pushnew repository *mvn-repositories*)
     85        (when repository
     86          (pushnew repository *mvn-repositories*))
    8687        ;;; Always set path to normalized path "on the way out" to
    8788        ;;; contain group-id/artifact-id/version
     
    118119        (classname (slot-value mvn-component 'asdf::classname))
    119120        (alternate-uri (slot-value mvn-component 'asdf::alternate-uri))
     121        (repository (slot-value mvn-component 'asdf::repository))
    120122        (version (if (slot-value mvn-component 'asdf::version)
    121123                     (slot-value mvn-component 'asdf::version)
     
    132134          (error "Unexpected Java exception~&~A.~&" e))))
    133135    (if (find-mvn)
    134         (resolve-dependencies group-id artifact-id version)
     136        (resolve-dependencies group-id artifact-id
     137                              :version version
     138                              :repository repository)
    135139        (if alternate-uri
    136140            (values (namestring alternate-uri) alternate-uri)
  • trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

    r14742 r14743  
    444444         (collect-request (java:jnew (jss:find-java-class "CollectRequest"))))
    445445    (#"setRoot" collect-request dependency)
    446     (#"addRepository" collect-request
    447                       (if repository-p
    448                           (ensure-remote-repository :repository repository)
    449                           (ensure-remote-repository)))
     446    (when repository
     447      (#"addRepository" collect-request
     448                        (if repository-p
     449                            (ensure-remote-repository :repository repository)
     450                            (ensure-remote-repository))))
    450451    (let* ((node
    451452            (#"getRoot" (#"collectDependencies" (ensure-repository-system) (ensure-session) collect-request)))
Note: See TracChangeset for help on using the changeset viewer.