[armedbear-cvs] r14205 - trunk/abcl/contrib/abcl-asdf

[mevenson at common-lisp.net]

Author: mevenson
Date: Thu Oct 18 23:43:14 2012
New Revision: 14205

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

Fix logic for working around a missing Maven.

ABCL-ASDF:RESOLVE had a broken conditional.

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

Modified: trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp	Tue Oct 16 23:51:59 2012	(r14204)
+++ trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp	Thu Oct 18 23:43:14 2012	(r14205)
@@ -120,10 +120,9 @@
       (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)))))))
   

Modified: trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp	Tue Oct 16 23:51:59 2012	(r14204)
+++ trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp	Thu Oct 18 23:43:14 2012	(r14205)
@@ -146,14 +146,14 @@
 (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*