Alan/osgi #241
Alan/osgi #241
Conversation
…since latter doesn't exist
Abcl 1.6.1 prs
There was a problem hiding this comment.
I rebased your changes onto abcl-1.7.1-dev as #241 for which you can see the failure under the CI as https://travis-ci.org/github/armedbear/abcl/jobs/702274183#L8225.
Running these changes locally, I was not able to do a simple abcl-asdf:resolve for dependencies.
Please add a test or two for the OSGI environment (or give me instructions) so I can ensure that the OSGI loading continues to work in the future.
| @@ -0,0 +1,25 @@ | |||
| (in-package :asdf) | |||
|
|
|||
| (defclass bundle (jar-file) | |||
There was a problem hiding this comment.
ASDF has a bundle-op, so to avoid confusion please rename to osgi-bundle.
| @@ -428,6 +428,7 @@ hint." | |||
|
|
|||
| (defun make-session (repository-system) | |||
| "Construct a new aether.RepositorySystemSession from the specified REPOSITORY-SYSTEM." | |||
| (unless *init* (init)) | |||
There was a problem hiding this comment.
Remove. the with-aether macro now does the necessary initialization.
| (if (consp resolved) | ||
| (jcall "loadClass" (car resolved) (second resolved)) | ||
| (jclass resolved)))) | ||
| )))) |
There was a problem hiding this comment.
Style: please no dangling parenthesis.
| (invoke-restargs ,name ,object-var ,args-var ,(eql arg 0))))))) | ||
| (defun read-invoke (stream char arg) | ||
| (if (eql arg 1) | ||
| (progn (require 'javaparser) |
There was a problem hiding this comment.
-
javaparseris an ASDF system so please useasdf:load-system -
Thunking through the load routines each time
read-invokeis gonna be expensive isn't it? Maybe just move thejavaparserinto a dependent system ofjssasjss/javaparseralways loading this?
| @@ -304,6 +331,15 @@ want to avoid the overhead of the dynamic dispatch." | |||
| (ambiguous matches)))) | |||
| (ambiguous matches)))))))))) | |||
|
|
|||
| ;; Interactive use: Give a full class name as a string, return the shortest unique abbreviation | |||
| (defun shortest-unambiguous-java-class-abbreviation(name &optional as-string?) | |||
There was a problem hiding this comment.
Very cool. Always wanted to code this one…
| @@ -512,28 +545,33 @@ associated is used to look up the static FIELD." | |||
| (when *do-auto-imports* | |||
| (do-auto-imports))) | |||
|
|
|||
| (defun japropos (string) | |||
| (defun japropos (string &optional (fn (lambda(match type bundle?) (format t "~a: ~a~a~%" match type bundle?)))) | |||
There was a problem hiding this comment.
Kinda convoluted.
-
Rewrite as a keyword argument,
&optionalargs are hard to refactor when we need further changes. -
Please document better.
| @@ -1,6 +1,10 @@ | |||
| (eval-when (:compile-toplevel :load-toplevel :execute) | |||
There was a problem hiding this comment.
This doesn't seem to work.
Please fix, moving out of cl-user.
Re-apply @alanruttenberg's work on OSGI #135 to abcl-1.7.1-dev
In local testing these changes bork basic usage of
abcl-asdf:resolvefor Maven components not in bundles. Creating a merge request to trigger the CI build for feedback to Alan.