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

Fix logic for working around a missing Maven.

ABCL-ASDF:RESOLVE had a broken conditional.
parent e187c443
......@@ -120,10 +120,9 @@ remote binary artifact."
(if (find-mvn)
(resolve-dependencies group-id artifact-id version)
(cond
((string= name
"net.java.dev.jna/jna/3.4.0"
(let ((uri #p"http://repo1.maven.org/maven2/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"))
(values (namestring uri) uri))))
((string= name "net.java.dev.jna/jna/3.4.0")
(let ((uri #p"http://repo1.maven.org/maven2/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar")))
(values (namestring uri) uri))
(t
(error "Failed to resolve MVN component name ~A." name)))))))
......
......@@ -146,14 +146,14 @@ Returns the path of the Maven executable or nil if none are found."
(defparameter *init* nil)
(defun init (&optional &key (force nil))
"Run the initialization strategy to bootstrap a Maven dependency node."
(unless (or force *mvn-libs-directory*)
(setf *mvn-libs-directory* (find-mvn-libs)))
(unless (probe-file *mvn-libs-directory*)
(error "You must download maven-3.0.4 or later from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately."))
(unless (ensure-mvn-version)
(error "We need maven-3.0.4 or later."))
(add-directory-jars-to-class-path *mvn-libs-directory* nil)
"Run the initialization strategy to bootstrap a Maven dependency node."
(unless (or force *mvn-libs-directory*)
(setf *mvn-libs-directory* (find-mvn-libs)))
(unless (and *mvn-libs-directory*
(probe-file *mvn-libs-directory*))
(error "You must download maven-3.0.4 or later from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately."))
(unless (ensure-mvn-version)
(error "We need maven-3.0.4 or later.")) (add-directory-jars-to-class-path *mvn-libs-directory* nil)
(setf *init* t))
(defparameter *http-wagon-implementations*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment