[armedbear-cvs] r13672 - trunk/abcl/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Mon Oct 24 00:56:18 2011
New Revision: 13672

Log:
Be a little smarter about finding the abcl-contrib archive.

A more optimal solution might rank possible canidates rather than
picking the first one which satisfies any clause of the named
conditional.

Modified:
   trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp	Mon Oct 24 00:37:45 2011	(r13671)
+++ trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp	Mon Oct 24 00:56:18 2011	(r13672)
@@ -8,7 +8,11 @@
 (defun find-system-jar () 
   (dolist (loader (java:dump-classpath))
     (let ((abcl-jar
-	   (find-if (lambda (p) (and (equal (pathname-name p) "abcl")
+	   (find-if (lambda (p) (and 
+                                 (or (equal (pathname-name p) "abcl")
+                                     (equal (pathname-name p) 
+                                            (format nil "abcl-~A" 
+                                                    (lisp-implementation-version))))
 				     (equal (pathname-type p) "jar")))
 		    (rest loader))))
       (when abcl-jar