proper Java/Scala compiler classpath for standalone application (see also make_isabelle_app() in Pure/Admin/build_release.scala); Isabelle2022-RC0
authorwenzelm
Mon, 08 Aug 2022 20:01:18 +0200
changeset 75797 b42e20adaeed
parent 75796 e5c3353df22e
child 75798 8b0dbfbde032
proper Java/Scala compiler classpath for standalone application (see also make_isabelle_app() in Pure/Admin/build_release.scala);
Admin/components/components.sha1
Admin/components/main
src/Tools/Setup/src/Build.java
--- a/Admin/components/components.sha1	Mon Aug 08 14:34:09 2022 +0200
+++ b/Admin/components/components.sha1	Mon Aug 08 20:01:18 2022 +0200
@@ -152,6 +152,7 @@
 b22066a9dcde6f813352dcf6404ac184440a22df isabelle_setup-20211109.tar.gz
 91c5d29e9fa40aee015e8e65ffea043e218c2fc5 isabelle_setup-20220323.tar.gz
 056979bd1c08eb9d0d12cc1118b4ff70bfe2d594 isabelle_setup-20220701.tar.gz
+be91402b3e5ef5bc6d4802a45175ee238cd9653e isabelle_setup-20220808.tar.gz
 0b2206f914336dec4923dd0479d8cee4b904f544 jdk-11+28.tar.gz
 e12574d838ed55ef2845acf1152329572ab0cc56 jdk-11.0.10+9.tar.gz
 3e05213cad47dbef52804fe329395db9b4e57f39 jdk-11.0.2+9.tar.gz
--- a/Admin/components/main	Mon Aug 08 14:34:09 2022 +0200
+++ b/Admin/components/main	Mon Aug 08 20:01:18 2022 +0200
@@ -9,7 +9,7 @@
 flatlaf-2.4
 idea-icons-20210508
 isabelle_fonts-20211004
-isabelle_setup-20220701
+isabelle_setup-20220808
 jdk-17.0.2+8
 jedit-20211103
 jfreechart-1.5.3
--- a/src/Tools/Setup/src/Build.java	Mon Aug 08 14:34:09 2022 +0200
+++ b/src/Tools/Setup/src/Build.java	Mon Aug 08 20:01:18 2022 +0200
@@ -492,13 +492,14 @@
                         output.print("### Building " + title + " (" + jar_path + ") ...\n");
                     }
 
-                    String isabelle_classpath = Environment.getenv("ISABELLE_CLASSPATH");
+                    String classpath1 = Environment.getenv("ISABELLE_CLASSPATH");
+                    String classpath2 = Environment.getenv("ISABELLE_SETUP_CLASSPATH");
 
                     Path build_dir = Files.createTempDirectory("isabelle");
                     try {
                         /* compile sources */
 
-                        for (String s : isabelle_classpath.split(":", -1)) {
+                        for (String s : (classpath1 + ":" + classpath2).split(":", -1)) {
                             if (!s.isEmpty()) {
                               compiler_deps.add(Path.of(Environment.platform_path(s)));
                             }