[armedbear-cvs] r14336 - branches/1.1.x/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Tue Dec 18 13:59:12 2012
New Revision: 14336

Log:
backport r14335 | mevenson | 2012-12-18 22:54:37 +0100 (Tue, 18 Dec 2012) | 1 line

abcl-contrib:  better logic for FIND-SYSTEM-JAR to deal with post patchlevel distinction.

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

Modified: branches/1.1.x/src/org/armedbear/lisp/abcl-contrib.lisp
==============================================================================
--- branches/1.1.x/src/org/armedbear/lisp/abcl-contrib.lisp	Tue Dec 18 13:54:37 2012	(r14335)
+++ branches/1.1.x/src/org/armedbear/lisp/abcl-contrib.lisp	Tue Dec 18 13:59:12 2012	(r14336)
@@ -2,20 +2,27 @@
 
 (require :asdf)
 
+(defun system-jar-p (p)
+  (and (pathnamep p)
+       (equal (pathname-type p) "jar")
+       (let ((name (pathname-name p)))
+         (or 
+          (java:jstatic "matches"
+                        "java.util.regex.Pattern" 
+                        "abcl(-[0-9]\\.[0-9]\\.[0-9]([+~-].+)?)?" 
+                        name)
+          (java:jstatic "matches"
+                        "java.util.regex.Pattern" 
+                        "abcl(-[0-9]\\.[0-9]\\.[0-9]\\.[0-9]([+~-]+)?)?" 
+                        name)))
+       p))
+
 (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`."
-  (flet ((match-system-jar (p)
-           (and (pathnamep p)
-                (equal (pathname-type p) "jar")
-                (java:jstatic "matches"
-                              "java.util.regex.Pattern" 
-                              "abcl(-[0-9]\\.[0-9]\\.[0-9]([+~-].+)?)?" 
-                              (pathname-name p))
-                p)))
+  "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 #'match-system-jar loader)))
+      (let ((abcl-jar (some #'system-jar-p loader)))
         (when abcl-jar
-          (return abcl-jar))))))
+          (return abcl-jar)))))
 
 (defvar *abcl-jar* nil
   "Pathname of the jar that ABCL was loaded from.
@@ -25,20 +32,10 @@
   "Pathname of the ABCL contrib.
 Initialized via SYSTEM:FIND-CONTRIB")
 
-(defun find-contrib (&key (verbose nil))
+(defun find-and-add-contrib (&key (verbose nil))
   "Attempt to find the ABCL contrib jar and add its contents to ASDF.
 Returns the pathname of the contrib if it can be found."
-  (unless *abcl-contrib*
-    (unless *abcl-jar*
-      (setf *abcl-jar* (find-system-jar)))
-    (when *abcl-jar*
-      (let* ((abcl-contrib-name
-              (concatenate 'string "abcl-contrib"
-                           (subseq (pathname-name *abcl-jar*) 4)))
-             (abcl-contrib (make-pathname :defaults *abcl-jar*
-                                          :name abcl-contrib-name)))
-	(if (probe-file abcl-contrib)
-            (progn
+  (flet ((add-contrib (abcl-contrib)
               (setf *abcl-contrib* abcl-contrib)
               (dolist (asdf-file
                         (directory (make-pathname :device (list *abcl-contrib*)
@@ -49,10 +46,27 @@
                   (unless (find asdf-directory asdf:*central-registry* :test #'equal)
                     (push asdf-directory asdf:*central-registry*)
                     (format verbose "~&Added ~A to ASDF.~&" asdf-directory))))
-              *abcl-contrib*)
-            (error "Failed to find abcl-contrib at '~A'." abcl-contrib))))))
+              *abcl-contrib*))
+    (unless *abcl-contrib*
+      (unless *abcl-jar*
+        (setf *abcl-jar* (find-system-jar)))
+      (when *abcl-jar*
+        (let* ((abcl-contrib-name
+                (concatenate 'string "abcl-contrib"
+                             (subseq (pathname-name *abcl-jar*) 4)))
+               (abcl-contrib (make-pathname :defaults *abcl-jar*
+                                            :name abcl-contrib-name)))
+          (if (probe-file abcl-contrib)
+              (add-contrib abcl-contrib)
+              (let ((abcl-contrib  (make-pathname :defaults abcl-contrib
+                                                  :name "abcl-contrib")))
+                (if (probe-file abcl-contrib)
+                    (progn  
+                      (warn "Falling back to using '~A' to satisfy require." abcl-contrib)
+                      (add-contrib abcl-contrib)
+                      (error "Failed to find abcl-contrib at '~A'." abcl-contrib))))))))))
 
-(when (find-contrib :verbose t)
+(when (find-and-add-contrib :verbose t)
   (provide :abcl-contrib))