Changeset 13672 for trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp

Timestamp:

10/24/11 07:56:18 (12 years ago)

Author:

Mark Evenson

Message:

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.

File:

• trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp (modified) (1 diff)

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

@@ -9 +9 @@
   (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))))