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

[mevenson at common-lisp.net]

Author: mevenson
Date: Sat Oct 13 08:19:20 2012
New Revision: 14195

Log:
abcl-asdf-0.9.0:  patching to greater global stability of distributed references.

Bump version to indicate that we have greater faith of the stability of the interface.

N.b. seems to break [Jeannie](http://bitbucket.org/easye/jeannie/).

Modified:
   trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd
   trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp

Modified: trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd	Sat Oct 13 06:20:48 2012	(r14194)
+++ trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd	Sat Oct 13 08:19:20 2012	(r14195)
@@ -2,7 +2,7 @@
 
 (asdf:defsystem :abcl-asdf
   :author "Mark Evenson"
-  :version "0.8.0"
+  :version "0.9.0"
   :depends-on (jss)
   :components 
   ((:module packages :pathname "" 

Modified: trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp	Sat Oct 13 06:20:48 2012	(r14194)
+++ trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp	Sat Oct 13 08:19:20 2012	(r14195)
@@ -103,17 +103,30 @@
 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."
-  (with-slots (name group-id artifact-id version) mvn-component
-    (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))))
-          (t 
-           (error "Failed to resolve MVN component name ~A." name)))))
-
+  (macrolet ((aif (something consequence alternative))
+             `(let ((it ,(something)))
+                (if it
+                    consequence
+                    alternative)))
+    (let ((name (slot-value mvn-component 'asdf::name))
+          (group-id (slot-value mvn-component 'asdf::group-id))
+          (artifact-id (slot-value mvn-component 'asdf::artifact-id))
+          (version (let ((it (slot-value mvn-component 'asdf::version)))
+                     (cond
+                       ((not it)
+                        it)
+                       (t 
+                        "LATEST")))))
+      (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))))
+            (t 
+             (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."
   (split-string classpath