Changeset 14205 for trunk/abcl/contrib/abcl-asdf

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:

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

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

@@ -121 +121 @@
           (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)))))))

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

@@ -147 +147 @@
 
 (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))