Changeset 14667

Timestamp:

04/17/14 10:34:35 (9 years ago)

Author:

Mark Evenson

Message:

Backport r14656: Find the versioned system and contrib jars when building with Maven

File:

• branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp (modified) (3 diffs)

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

@@ -28 +28 @@
                       (concatenate 'string name "(-[0-9]\\.[0-9]\\.[0-9]\\.[0-9]([+~-]+)?)?")
                       (pathname-name p)))
-       (make-pathname :defaults p :name name)))
+       p))
 
 (defun find-system ()
@@ -47 +47 @@
      #p"http://abcl.org/releases/current/abcl.jar")))
 
+(defun find-jar (predicate)
+  (dolist (loader (java:dump-classpath))
+    (let ((jar (some predicate loader)))
+      (when jar
+        (return jar)))))
+
 (defun find-system-jar ()
-  "Return the pathname of the system jar, one of `abcl.jar` or `abcl-m.n.p.jar` or `abcl-m.n.p[.~-]something.jar`."
-  (dolist (loader (java:dump-classpath))
-    (let ((abcl-jar (some #'system-jar-p loader)))
-      (when abcl-jar
-        (return abcl-jar)))))
+  "Return the pathname of the system jar, one of `abcl.jar` or
+`abcl-m.n.p.jar` or `abcl-m.n.p[.~-]something.jar`."
+  (find-jar #'system-jar-p))
+
+(defun find-contrib-jar ()
+  "Return the pathname of the contrib jar, one of `abcl-contrib.jar` or
+`abcl-contrib-m.n.p.jar` or `abcl-contrib-m.n.p[.~-]something.jar`."
+  (find-jar #'contrib-jar-p))
 
 (defvar *abcl-contrib* nil
@@ -88 +97 @@
   "Introspect runtime classpaths to find a loadable ABCL-CONTRIB."
   (or (ignore-errors
-        (when (find-system-jar)
-          (probe-file
-           (make-pathname :defaults (find-system-jar)
-                          :name "abcl-contrib"))))
+        (find-contrib-jar))
       (some
        (lambda (u)