[Armedbear-cvs] r14700 - branches/1.3.1/contrib/abcl-asdf

[mevenson at common-lisp.net]

Author: mevenson
Date: Sun Apr 27 14:17:38 2014
New Revision: 14700

Log:
Backport r14696:  Patch the Maven locator code to probe "/usr/local/maven/lib/".

>From a patch for OpenBSD provided by Timo Myyrä.

Modified:
   branches/1.3.1/contrib/abcl-asdf/abcl-asdf.asd
   branches/1.3.1/contrib/abcl-asdf/maven-embedder.lisp

Modified: branches/1.3.1/contrib/abcl-asdf/abcl-asdf.asd
==============================================================================
--- branches/1.3.1/contrib/abcl-asdf/abcl-asdf.asd	Sun Apr 27 14:16:02 2014	(r14699)
+++ branches/1.3.1/contrib/abcl-asdf/abcl-asdf.asd	Sun Apr 27 14:17:38 2014	(r14700)
@@ -2,8 +2,8 @@
 
 (asdf:defsystem :abcl-asdf
   :author "Mark Evenson"
-  :version "1.3.0"
-  :description "<> asdf:defsystem <urn:abcl.org/release/1.3.0/contrib/abcl-asdf#1.1.0>"
+  :version "1.3.1"
+  :description "<> asdf:defsystem <urn:abcl.org/release/1.3.0/contrib/abcl-asdf#1.3.1>"
   :depends-on (jss)
   :components 
   ((:module packages :pathname "" 

Modified: branches/1.3.1/contrib/abcl-asdf/maven-embedder.lisp
==============================================================================
--- branches/1.3.1/contrib/abcl-asdf/maven-embedder.lisp	Sun Apr 27 14:16:02 2014	(r14699)
+++ branches/1.3.1/contrib/abcl-asdf/maven-embedder.lisp	Sun Apr 27 14:17:38 2014	(r14700)
@@ -107,14 +107,16 @@
   (warn "Unable to locate Maven executable to find Maven Aether adaptors."))
 
 (defun find-mvn-libs ()
-  (let ((mvn (find-mvn)))
-    (unless mvn
-      (warn "Failed to find Maven3 libraries.")
-      (return-from find-mvn-libs nil))
-    (truename (make-pathname 
-               :defaults (merge-pathnames "../lib/" mvn)
-               :name nil :type nil))))
-
+  (unless (find-mvn)
+    (warn "Failed to find Maven executable to determine Aether library location."))
+  (some 
+   (lambda (d)
+     (when (directory (merge-pathnames "maven-core-*.jar" d))
+       (truename d)))
+   (list (make-pathname :defaults (merge-pathnames "../lib/" (find-mvn))
+                        :name nil :type nil)
+         #p"/usr/local/maven/lib/"))) ;; OpenBSD location suggested by Timo Myyrä
+                                  
 (defparameter *mvn-libs-directory*
   nil
   "Location of 'maven-core-3.<m>.<p>.jar', 'maven-embedder-3.<m>.<p>.jar' etc.")
@@ -158,7 +160,11 @@
 (defparameter *init* nil)
 
 (defun init (&optional &key (force nil))
- "Run the initialization strategy to bootstrap a Maven dependency node."
+ "Run the initialization strategy to bootstrap a Maven dependency node.
+
+Set *MVN-LIBS-DIRECTORY* to an explicit value before running this
+function in order to bypass the dynamic introspection of the location
+of the mvn executable with an explicit value."
  (unless (or force *mvn-libs-directory*)
    (setf *mvn-libs-directory* (find-mvn-libs)))
   (unless (and *mvn-libs-directory*