Commit ca49a60c authored by mevenson@1c010e3e-69d0-11dd-93a8-456734b0d56f's avatar mevenson@1c010e3e-69d0-11dd-93a8-456734b0d56f
Browse files

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

From a patch for OpenBSD provided by Timo Myyrä.
parent d2ce6639
......@@ -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 ""
......
......@@ -107,14 +107,16 @@ Emits warnings if not able to find a suitable executable."
(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 @@ Emits warnings if not able to find a suitable executable."
(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*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment