Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
abcl
abcl
Commits
febfa950
Commit
febfa950
authored
Mar 21, 2014
by
mevenson@1c010e3e-69d0-11dd-93a8-456734b0d56f
Browse files
Find the versioned system and contrib jars when building with Maven
parent
54fa2163
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/org/armedbear/lisp/abcl-contrib.lisp
View file @
febfa950
...
...
@@ -27,7 +27,7 @@
"java.util.regex.Pattern"
(
concatenate
'string
name
"(-[0-9]\\.[0-9]\\.[0-9]\\.[0-9]([+~-]+)?)?"
)
(
pathname-name
p
)))
(
make-pathname
:defaults
p
:name
name
)
))
p
))
(
defun
find-system
()
"Find the location of the system.
...
...
@@ -46,12 +46,21 @@ Used to determine relative pathname to find 'abcl-contrib.jar'."
(
ignore-errors
#p"http://abcl.org/releases/current/abcl.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`."
(
defun
find-jar
(
predicate
)
(
dolist
(
loader
(
java:dump-classpath
))
(
let
((
abcl-jar
(
some
#'
system-jar-p
loader
)))
(
when
abcl-jar
(
return
abcl-jar
)))))
(
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`."
(
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
"Pathname of the ABCL contrib.
...
...
@@ -87,10 +96,7 @@ Returns the pathname of the contrib if it can be found."
(
defun
find-contrib
()
"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
)
(
probe-file
(
make-pathname
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment