Commit | Line | Data |
---|---|---|
d9ef5aeb AA |
1 | Subject: [PATCH] openjfx: Determine the version of Java in JDK_HOME |
2 | ||
3 | Icedtea contains guix in its version, so build.gradle failes to run. Openjfx | |
4 | packaging is not trivial, so you will probably need to try build it with | |
5 | gradlew. | |
6 | ||
7 | --- | |
8 | build.gradle | 5 ++--- | |
9 | 1 file changed, 2 insertions(+), 3 deletions(-) | |
10 | ||
11 | diff --git a/build.gradle b/build.gradle | |
12 | index df82f63..2c626cd 100644 | |
13 | --- a/build.gradle | |
14 | +++ b/build.gradle | |
15 | @@ -742,9 +742,9 @@ try { | |
16 | if (inStream.readLine() != null) { | |
17 | String v = inStream.readLine(); | |
18 | if (v != null) { | |
19 | - int ib = v.indexOf(" (build "); | |
20 | + int ib = v.indexOf(" (guix build "); | |
21 | if (ib != -1) { | |
22 | - String ver = v.substring(ib + 8, v.size() - 1); | |
23 | + String ver = v.substring(ib + 13, v.size() - 1); | |
24 | ||
25 | defineProperty("jdkRuntimeVersion", ver) | |
26 | defineProperty("jdkVersion", jdkRuntimeVersion.split("-")[0]) | |
27 | 2.24.1 |