Changeset 14193

Timestamp:

10/13/12 10:09:08 (11 years ago)

Author:

Mark Evenson

Message:

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

Location:

trunk/abcl/contrib/abcl-asdf

Files:

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

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

@@ -104 +104 @@
 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"
@@ -114 +113 @@
                       (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)

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

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