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

[mevenson at common-lisp.net]

Author: mevenson
Date: Sat Oct 13 03:09:08 2012
New Revision: 14193

Log:
abcl-asdf: make 'com.sun.jna:jna' a synonym for a known, good jna mvn URI.

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	Sat Oct 13 02:12:36 2012	(r14192)
+++ trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp	Sat Oct 13 03:09:08 2012	(r14193)
@@ -103,17 +103,16 @@
 Returns a string in JVM CLASSPATH format as entries delimited by
 classpath separator string.  Can possibly be a single entry denoting a
 remote binary artifact."
-  (let ((name (asdf::component-name mvn-component)))
+  (with-slots (name group-id artifact-id version) mvn-component
     (if (find-mvn)
-        (with-slots (asdf::group-id asdf::artifact-id asdf::version) mvn-component
-          (resolve-dependencies asdf::group-id asdf::artifact-id asdf::version))
-        (cond 
+        (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))))
           (t 
-           (error "Failed to resolve MVN component name ~A." name))))))
+           (error "Failed to resolve MVN component name ~A." name)))))
 
 (defun as-classpath (classpath)
   "Break apart the JVM CLASSPATH string into a list of its consituents."

Modified: trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp	Sat Oct 13 02:12:36 2012	(r14192)
+++ trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp	Sat Oct 13 03:09:08 2012	(r14193)
@@ -413,6 +413,8 @@
     (cond 
       ((= (length result) 3)
        (resolve-dependencies (first result) (second result) (third result)))
+      ((string= string "com.sun.jna:jna")
+       (resolve-dependencies "net.java.dev.jna" "jna" "3.4.0"))
       (t
        (apply #'resolve-dependencies result)))))