Changeset 15134

Timestamp:

11/01/19 15:52:46 (4 years ago)

Author:

Mark Evenson

Message:

Broadly establishes buildability across java8 and java11 targets

Location:

trunk/abcl

Files:

• contrib/jss/invoke.lisp (modified) (2 diffs)
• src/org/armedbear/lisp/abcl-contrib.lisp (modified) (5 diffs)

trunk/abcl/contrib/jss/invoke.lisp

@@ -421 +421 @@
   (set-java-field object field value try-harder))
 
-
 (defconstant +for-name+ 
   (jmethod "java.lang.Class" "forName" "java.lang.String" "boolean" "java.lang.ClassLoader"))
@@ -439 +438 @@
 
 (defun do-auto-imports ()
+  (if (sys::system-artifacts-are-jars-p)
+      (do-auto-imports-from-jars)
+      (progn
+        ;;; First, import all the classes available from the module system
+        (do-auto-imports-from-modules)
+        ;;; Then, introspect any jars that appear on the classpath
+        (loop :for entry :in (second (multiple-value-list (sys::java.class.path)))
+             :doing (let ((p (pathname entry)))
+                      (when (string-equal (pathname-type p) "jar")
+                        (jar-import p)))))))
+
+(defun do-auto-imports-from-modules ()
+  (loop :for (name . full-class-name) :in (all-class-names-from-modules)
+     :doing
+       (pushnew full-class-name (gethash name *class-name-to-full-case-insensitive*) 
+                :test 'equal)))
+
+(defun all-class-names-from-modules ()
+  (let ((class-pattern (jstatic "compile" "java.util.regex.Pattern" ".*\\.class$"))
+        (name-pattern (jstatic "compile" "java.util.regex.Pattern" ".*?([^.]*)$")))
+    (loop
+       :for module :across (chain (jstatic "boot" "java.lang.ModuleLayer")
+                                  "configuration" "modules" "stream" "toArray")
+       :appending
+         (loop
+            :for class-as-path :across (chain module "reference" "open" "list" "toArray")
+            :when
+              (jcall "matches" (jcall "matcher" class-pattern class-as-path))
+            :collect
+              (let* ((full-name (jcall "substring" (jcall "replace" class-as-path #\/ #\.)
+                                           0
+                                           (- (jcall "length" class-as-path) (jcall "length" ".class"))))
+                     (matcher (jcall "matcher" name-pattern full-name))
+                     (name (progn
+                             (jcall "matches" matcher)
+                             (jcall "group" matcher 1))))
+                (cons name full-name))))))
+
+(defun do-auto-imports-from-jars ()
   (labels ((expand-paths (cp)
              (loop :for s :in cp

trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp

@@ -11 +11 @@
     (java:jcall get-classloader boot-class)))
 
-;;; java1.[678] packages the JVM system artifacts as jar files
+;;; java[678] packages the JVM system artifacts as jar files
+;;; java11 uses the module system 
 (defun system-artifacts-are-jars-p ()
   (java:jinstance-of-p (boot-classloader) "java.net.URLClassLoader"))
@@ -70 +71 @@
 
 (defun java.class.path ()
+  "Return a list of the directories as pathnames referenced in the JVM classpath."
   (let* ((separator (java:jstatic "getProperty" "java.lang.System" "path.separator"))
-   (path (java:jcall "split"
+   (paths (coerce (java:jcall "split"
          (java:jstatic "getProperty" "java.lang.System"
            "java.class.path")
-         separator)))
-    (setf path (coerce path 'list))
-    (values
-     (mapcar (lambda (jar)
-         (make-pathname :defaults jar
-            :name nil
-            :type nil))
-       path)
-     path)))
+         separator)
+                        'list))
+         (p (coerce paths 'list)))
+    (flet ((directory-of (p) (make-pathname :defaults p :name nil :type nil)))
+      (values
+       (mapcar #'directory-of p)
+       p))))
 
 (defun enumerate-resource-directories ()
@@ -105 +105 @@
         (t
          (format *standard-output*
-                 "Skipping enumeration of resource ~a with type ~a"
+                 "~&Skipping enumeration of resource '~a' with type '~a'.~%"
                  entry (type-of entry)))))
       result)))
@@ -152 +152 @@
 returns the pathname of the contrib if it can be found."
    (if *abcl-contrib*
-       (format verbose "~&; Using already initialized value of SYS:*ABCL-CONTRIB* '~A'.~%"
+       (format verbose "~&; Finding contribs utilizing previously initialized value of SYS:*ABCL-CONTRIB* '~A'.~%"
                *abcl-contrib*)
        (progn
@@ -231 +231 @@
 (export '(find-system
           find-contrib
+          system-artifacts-are-jars-p
+          java.class.path
           *abcl-contrib*)
         :system)