Changeset 14791


Ignore:
Timestamp:
07/01/15 04:16:20 (6 years ago)
Author:
Mark Evenson
Message:

abcl-asdf: fix usage with local repository

Location:
trunk/abcl/contrib/abcl-asdf
Files:
3 edited

Legend:

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

    r14790 r14791  
    33(asdf:defsystem :abcl-asdf
    44  :author "Mark Evenson"
    5   :version "1.5.0"
    6   :description "<> asdf:defsystem <urn:abcl.org/release/1.4.0-dev/contrib/abcl-asdf#1.5.0>"
     5  :version "1.5.1"
     6  :description "<> asdf:defsystem <urn:abcl.org/release/1.4.0-dev/contrib/abcl-asdf#1.5.1>"
    77  :depends-on (jss)
    88  :components
  • trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp

    r14748 r14791  
    138138                              :repository repository)
    139139        (if alternate-uri
    140             (values (namestring alternate-uri) alternate-uri)
     140            (values (pathname alternate-uri) alternate-uri)
    141141            (error "Failed to resolve MVN component name ~A." name)))))
    142142
  • trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

    r14789 r14791  
    450450                               (repository *maven-remote-repository* repository-p))
    451451  "Dynamically resolve Maven dependencies for item with GROUP-ID and ARTIFACT-ID
    452 optionally with a VERSION and a REPOSITORY.  Users of the function are advised
     452optionally with a VERSION and a REPOSITORY. 
    453453
    454454All recursive dependencies will be visited before resolution is successful.
     
    470470         (collect-request (java:jnew (jss:find-java-class "CollectRequest"))))
    471471    (#"setRoot" collect-request dependency)
    472     (#"addRepository" collect-request
    473                       (if repository-p
    474                           (ensure-remote-repository :repository repository)
    475                           (ensure-remote-repository)))
     472     ;; Don't call addRepository if we explicitly specify a NIL repository
     473    (unless (and repository-p (not repository))
     474      (#"addRepository" collect-request
     475                        (if repository-p
     476                            (ensure-remote-repository :repository repository)
     477                            (ensure-remote-repository))))
    476478    (let* ((node
    477479            (#"getRoot" (#"collectDependencies" (ensure-repository-system) (ensure-session) collect-request)))
Note: See TracChangeset for help on using the changeset viewer.