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

[mevenson at common-lisp.net]

Author: mevenson
Date: Sat Oct 13 02:12:34 2012
New Revision: 14191

Log:
Cut the crap.

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

Modified: trunk/abcl/contrib/mvn/jna.asd
==============================================================================
--- trunk/abcl/contrib/mvn/jna.asd	Fri Oct 12 06:18:12 2012	(r14190)
+++ trunk/abcl/contrib/mvn/jna.asd	Sat Oct 13 02:12:34 2012	(r14191)
@@ -14,24 +14,8 @@
   ;; Theoretically this should be the same thing as the MVN component.
   (handler-case 
       (unless (jss:find-java-class "com.sun.jna.Native")
-        (unless 
-            (flet ((match-jna-jar (p)
-                     "Match `jna.jar`,`jna-3.0.9.jar`, or `jna-3.4.0.jar`."
-                     (and (pathnamep p)
-                          (equal (pathname-type p) "jar")
-                          (java:jstatic "matches"
-                                        "java.util.regex.Pattern" 
-                                        "jna(-[0-9]\\.[0-9]\\.[0-9](-.+)?)?" 
-                                        (pathname-name p))
-                          p)))
-              (dolist (loader (java:dump-classpath))
-                (let ((jna-jar (some #'match-jna-jar loader)))
-                  (when jna-jar
-                    (return abcl-jar)))))
-          (unless 
-              (java:add-to-classpath (abcl-asdf:resolve
-                                      "net.java.dev.jna:jna:3.4.0"))
-            (java:add-to-classpath "http://repo1.maven.org/maven2/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"))))
+        (unless (java:add-to-classpath (abcl-asdf:resolve "net.java.dev.jna:jna:3.4.0"))
+          (java:add-to-classpath "http://repo1.maven.org/maven2/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar")))
     (t (e) 
       (error "Failed to resolve 'jna.jar' because~&~A." e))))