[armedbear-cvs] r14187 - trunk/abcl/contrib/mvn

[mevenson at common-lisp.net]

Author: mevenson
Date: Fri Oct 12 05:04:34 2012
New Revision: 14187

Log:
Fallback to reliable JNA loading for CFFI.

Implemented by moving JNA loading "down" an abstraction to ABCL-ASDF
primitive until we establish better handlers in the ABCL-ASDF:MVN
loading semantics.

Modified:
   trunk/abcl/contrib/mvn/jna.asd

Modified: trunk/abcl/contrib/mvn/jna.asd
==============================================================================
--- trunk/abcl/contrib/mvn/jna.asd	Fri Oct 12 04:35:25 2012	(r14186)
+++ trunk/abcl/contrib/mvn/jna.asd	Fri Oct 12 05:04:34 2012	(r14187)
@@ -3,5 +3,11 @@
 ;;;; Need to have jna.jar present for CFFI to have a chance of working.
 (asdf:defsystem :jna 
     :version "3.4.0"
-    :defsystem-depends-on (abcl-asdf)
-    :components ((:mvn "net.java.dev.jna/jna/3.4.0")))
+    :defsystem-depends-on (abcl-asdf))
+;; FIXME:  install a better handler in abcl-asdf  :components ((:mvn "net.java.dev.jna/jna/3.4.0")))
+
+(defmethod asdf:perform :after ((o asdf:load-op) (c (eql (asdf:find-system :jna))))
+  ;; Theoretically this should be the same thing as the MVN component.
+  (java:add-to-classpath (abcl-asdf:resolve "net.java.dev.jna:jna:3.4.0")))
+
+