Changeset 14700

Timestamp:

04/27/14 14:17:38 (9 years ago)

Author:

Mark Evenson

Message:

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

From a patch for OpenBSD provided by Timo Myyrä.

Location:

branches/1.3.1/contrib/abcl-asdf

Files:

• abcl-asdf.asd (modified) (1 diff)
• maven-embedder.lisp (modified) (2 diffs)

branches/1.3.1/contrib/abcl-asdf/abcl-asdf.asd

@@ -3 +3 @@
 (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 

branches/1.3.1/contrib/abcl-asdf/maven-embedder.lisp

@@ -108 +108 @@
 
 (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
@@ -159 +161 @@
 
 (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)))