Changeset 14205


Ignore:
Timestamp:
10/19/12 06:43:14 (8 years ago)
Author:
Mark Evenson
Message:

abcl-asdf: Patch to fix obvious mistakes (stas).

Fix logic for working around a missing Maven.

ABCL-ASDF:RESOLVE had a broken conditional.

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

Legend:

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

    r14195 r14205  
    121121          (resolve-dependencies group-id artifact-id version)
    122122          (cond
    123             ((string= name
    124                       "net.java.dev.jna/jna/3.4.0"
    125                       (let ((uri #p"http://repo1.maven.org/maven2/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"))
    126                         (values (namestring uri) uri))))
     123            ((string= name "net.java.dev.jna/jna/3.4.0")
     124             (let ((uri #p"http://repo1.maven.org/maven2/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar")))
     125                        (values (namestring uri) uri))
    127126            (t
    128127             (error "Failed to resolve MVN component name ~A." name)))))))
  • trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

    r14193 r14205  
    147147
    148148(defun init (&optional &key (force nil))
    149   "Run the initialization strategy to bootstrap a Maven dependency node."
    150   (unless (or force *mvn-libs-directory*)
    151     (setf *mvn-libs-directory* (find-mvn-libs)))
    152   (unless (probe-file *mvn-libs-directory*)
    153     (error "You must download maven-3.0.4 or later from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately."))
    154   (unless (ensure-mvn-version)
    155     (error "We need maven-3.0.4 or later."))
    156   (add-directory-jars-to-class-path *mvn-libs-directory* nil)
     149 "Run the initialization strategy to bootstrap a Maven dependency node."
     150 (unless (or force *mvn-libs-directory*)
     151   (setf *mvn-libs-directory* (find-mvn-libs)))
     152  (unless (and *mvn-libs-directory*
     153               (probe-file *mvn-libs-directory*))
     154   (error "You must download maven-3.0.4 or later from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately."))
     155 (unless (ensure-mvn-version)
     156   (error "We need maven-3.0.4 or later."))  (add-directory-jars-to-class-path *mvn-libs-directory* nil)
    157157  (setf *init* t))
    158158
Note: See TracChangeset for help on using the changeset viewer.