Skip to content

Commit 166781e

Browse files
benfrybenfry
committed
move to JDK 11.0.9.1 and hack up downloader to support 9.1 as the suffix
1 parent fac8a8e commit 166781e

File tree

3 files changed

+20
-35
lines changed

3 files changed

+20
-35
lines changed

‎build/build.xml‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -79,49 +79,28 @@
7979
</and>
8080
</condition>
8181

82-
<!-- could prompt here to download the necessary JRE
83-
(Windows/Linux) or JDK (on Mac OS X) -->
82+
<!-- Could prompt here to download the necessary JDK... -->
8483

8584
<property name="examples.dir"
8685
value="../../processing-docs/content/examples" />
8786

8887
<property name="jdk.train" value="11" />
8988
<property name="jdk.version" value="0" />
90-
<property name="jdk.update" value="8" />
91-
<property name="jdk.build" value="10" />
89+
<property name="jdk.update" value="9.1" />
90+
<property name="jdk.build" value="1" />
9291

9392
<property name="jdk.prefix" value="jdk" />
9493
<property name="jdk.esoteric" value="${jdk.train}.${jdk.version}.${jdk.update}" />
9594

96-
<!-- as of 200815, gluon is currently working on 14.0, and has 11.0.8 available for
97-
commercial clients as an LTS release, but 11.0.2 is the latest public version -->
95+
<!-- As of 210117, Gluon has 11.0.8 available for commercial clients
96+
as an LTS release, but 11.0.2 is the latest free/public version -->
9897
<property name="jfx.train" value="11" />
9998
<property name="jfx.version" value="0" />
10099
<property name="jfx.update" value="2" />
101100
<property name="jfx.build" value="0" />
102101

103102
<property name="jfx.name" value="${jfx.train}.${jfx.version}.${jfx.update}" />
104103

105-
106-
<!-- Figure out the JRE download location for Linux and Windows. -->
107-
<!--
108-
<condition property="jdk.file"
109-
value="jdk-${jdk.short}-${target-platform}-i586.tar.gz">
110-
<equals arg1="${jdk.data.model}" arg2="32" />
111-
</condition>
112-
<condition property="jdk.file"
113-
value="jdk-${jdk.short}-${target-platform}-x64.tar.gz">
114-
<equals arg1="${jdk.data.model}" arg2="64" />
115-
</condition>
116-
-->
117-
118-
<!-- JDK location for Mac OS X -->
119-
<!--
120-
<condition property="jdk.file" value="jdk-${jdk.short}-macosx-x64.dmg">
121-
<equals arg1="${target-platform}" arg2="macosx" />
122-
</condition>
123-
-->
124-
125104
<!-- These lists haven't been updated since Java 6. The new list:
126105
http://www.oracle.com/technetwork/java/javase/jdk-8-readme-2095710.html
127106
Please help: https://github.com/processing/processing/issues/3288 -->

‎build/jre/src/Downloader.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class Downloader extends Task {
3434
private String platform; // macos
3535
private int train; // Java 11 (was 1 through Java 8)
3636
private int version; // 0 (was 8 prior to Java 9)
37-
private int update; // Update 131
37+
private String update; // Update 131
3838
private int build; // Build 11
3939

4040
private String component; // "jdk" or "jfx"
@@ -80,7 +80,7 @@ public void setVersion(int version) {
8080
*
8181
* @param update The update within the version to use like 1 for "11.0.1_13".
8282
*/
83-
public void setUpdate(int update) {
83+
public void setUpdate(String update) {
8484
this.update = update;
8585
}
8686

@@ -250,9 +250,9 @@ void download() throws IOException {
250250

251251

252252
static private String adoptOpenJdkUrl(String platform, String component,
253-
int train, int version, int update,
253+
int train, int version, String update,
254254
int build, String flavor) {
255-
final String URL_FORMAT = "https://github.com/AdoptOpenJDK/openjdk%d-binaries/releases/download/jdk-%d.%d.%d%%2B%d/OpenJDK%dU-%s_%d.%d.%d_%d.%s";
255+
final String URL_FORMAT = "https://github.com/AdoptOpenJDK/openjdk%d-binaries/releases/download/jdk-%d.%d.%s%%2B%d/OpenJDK%dU-%s_%d.%d.%s_%d.%s";
256256

257257
String filename = null;
258258
switch (platform) {
@@ -286,9 +286,9 @@ static private String adoptOpenJdkUrl(String platform, String component,
286286

287287

288288
static private String gluonHqUrl(String platform, String component,
289-
int train, int version, int update) {
289+
int train, int version, String update) {
290290
final String URL_FORMAT =
291-
"https://gluonhq.com/download/javafx-%d-%d-%d-sdk-%s/";
291+
"https://gluonhq.com/download/javafx-%d-%d-%s-sdk-%s/";
292292

293293
String platformShort;
294294
if (platform.contains("linux")) {
@@ -317,12 +317,12 @@ static private String gluonHqUrl(String platform, String component,
317317
* @param flavor The flavor like "macosx-x64.dmg".
318318
*/
319319
static private String getLocalFilename(String component, int version,
320-
int update, String flavor) {
320+
String update, String flavor) {
321321
String versionStr;
322-
if (update == 0) {
322+
if (update.equals("0")) {
323323
versionStr = String.format("-%d-%s", version, flavor);
324324
} else {
325-
versionStr = String.format("-%du%d-%s", version, update, flavor);
325+
versionStr = String.format("-%du%s-%s", version, update, flavor);
326326
}
327327
return component + versionStr;
328328
}

‎todo.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ already fixed in 4.x? (confirm/close on release)
5959
_ HDPI support GNOME desktop
6060
_ https://github.com/processing/processing/issues/6059
6161

62+
file issues
63+
_ update the splash screen to say 2021
64+
_ remove the JRE Downloader
6265

6366
_ disable "notifications" prompt on startup for macOS
6467
_ (we're not posting any notifications, at least for now)
@@ -86,6 +89,9 @@ _ i.e. all the things that rely on preferences can be inited separately (later
8689
decisions before final 4.0 release
8790
X Shutting off VAqua due to interface ugliness and Contribution Manager freezing
8891
_ https://github.com/processing/processing4/issues/129
92+
_ now with a release 9 to cover Big Sur
93+
_ https://violetlib.org/vaqua/downloads.html
94+
_ make the final call to remove, or put the libs on download.processing.org
8995
_ Some 3.x Tools not working because JavaFX isn't on the classpath
9096
_ https://github.com/processing/processing4/issues/110
9197
_ Friendly Names for new Sketches (includes UI for switching it back)

0 commit comments

Comments
 (0)