Changeset 14236 for trunk/abcl/contrib/mvn/jna.asd

Timestamp:

11/09/12 14:44:33 (8 years ago)

Author:

Mark Evenson

Message:

abcl-asdf: Enable bypassing of loading from network if a given class already exists.

An ASDF:MVN component can now optionally specify a CLASSNAME that if
able to be found in the current jvm process, inhbits further loading
from the network.

An ASDF:MVN component may also optionally specify an ALTERNATE-URI
that will be added to the current jvm classpath if Maven cannot be
invoked. Most jvm implementations won't access such jar archives from
the network by default, so this is an intermediate step before
actually writing the code to download the jar to the local filesystem
to then be added.

Refresh documentation in README.markdown.

File:

• trunk/abcl/contrib/mvn/jna.asd (modified) (2 diffs)

trunk/abcl/contrib/mvn/jna.asd

@@ -1 +1 @@
 ;;;; -*- Mode: LISP -*-
 
-;;;; Need to have jna.jar present for CFFI to have a chance of working.
+;;;; Need to have jna.jar present for CFFI to work.
 (asdf:defsystem :jna 
     :version "3.5.1"
     :defsystem-depends-on (jss abcl-asdf)
 ;; FIXME: always seems to be resolving the LATEST maven artifact.
-    :components ((:mvn "net.java.dev.jna/jna/3.5.1")))
+    :components ((:mvn "net.java.dev.jna/jna/3.5.1"
+                  :alternate-uri "http://repo1.maven.org/maven2/net/java/dev/jna/jna/3.5.1/jna-3.5.1.jar"
+                  :classname "com.sun.jna.Native")))
 
 (in-package :asdf) 
@@ -13 +15 @@
     (provide :jna)))
 
-;;; After ASDF performs COMPILE-OP, one expects that the JNA Java
-;;; classes can be instantiated.  If not, execute various loading strategies.
-(defmethod perform ((o compile-op) (c (eql (find-system :jna))))
-  ;; Theoretically this should be the same thing as the MVN component.
-  (format *debug-io* "~&Attemping to locate jvm binary artifacts for JNA...~&")
-  (handler-case 
-      (jss:find-java-class "com.sun.jna.Native")
-    (java:java-exception (e)
-      (unless 
-          (java:add-to-classpath (abcl-asdf:resolve "net.java.dev.jna:jna:3.5.1"))
-        (unless 
-            ;; Might want to download to local filesystem, then place in classpath
-            (java:add-to-classpath #p"http://repo1.maven.org/maven2/net/java/dev/jna/jna/3.5.1/jna-3.5.1.jar")
-          (error "Failed to load jna-3.5.0.jar from the network via URI."))
-        (error "Failed to load jna.jar via ABCL-ASDF.")))
-    (t (e) 
-      (error "Failed to resolve 'jna.jar' because~&~A.~&" e))))
-