[Armedbear-cvs] r14668 - branches/1.3.1/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Thu Apr 17 10:35:17 2014
New Revision: 14668

Log:
Backport r14657:  Find contrib based on system jar name.

>From Olof-Joachim Frahm.

Modified:
   branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp

Modified: branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp
==============================================================================
--- branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp	Thu Apr 17 10:34:35 2014	(r14667)
+++ branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp	Thu Apr 17 10:35:17 2014	(r14668)
@@ -97,6 +97,14 @@
   "Introspect runtime classpaths to find a loadable ABCL-CONTRIB."
   (or (ignore-errors
         (find-contrib-jar))
+      (ignore-errors
+        (let ((system-jar (find-system-jar)))
+          (when system-jar
+            (probe-file (make-pathname
+                         :defaults system-jar
+                         :name (concatenate 'string
+                                            "abcl-contrib"
+                                            (subseq (pathname-name system-jar) 4)))))))
       (some
        (lambda (u)
          (probe-file (make-pathname