diff --git a/java/application/launch4j/LICENSE.txt b/java/application/launch4j/LICENSE.txt index bf03c83d7..476f9e82d 100644 --- a/java/application/launch4j/LICENSE.txt +++ b/java/application/launch4j/LICENSE.txt @@ -1,7 +1,7 @@ Launch4j (http://launch4j.sourceforge.net/) Cross-platform Java application wrapper for creating Windows native executables. -Copyright (c) 2004, 2015 Grzegorz Kowal +Copyright (c) 2004, 2021 Grzegorz Kowal All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/java/application/launch4j/bin/ld-linux b/java/application/launch4j/bin/ld-linux index 2e2983e88..0e16844ca 100755 Binary files a/java/application/launch4j/bin/ld-linux and b/java/application/launch4j/bin/ld-linux differ diff --git a/java/application/launch4j/bin/ld-macosx b/java/application/launch4j/bin/ld-macosx index 9722d6f9d..3defcfa52 100755 Binary files a/java/application/launch4j/bin/ld-macosx and b/java/application/launch4j/bin/ld-macosx differ diff --git a/java/application/launch4j/bin/windres-linux b/java/application/launch4j/bin/windres-linux index 5b83b9349..76b630e63 100755 Binary files a/java/application/launch4j/bin/windres-linux and b/java/application/launch4j/bin/windres-linux differ diff --git a/java/application/launch4j/bin/windres-macosx b/java/application/launch4j/bin/windres-macosx index 84a704e03..95405de0c 100755 Binary files a/java/application/launch4j/bin/windres-macosx and b/java/application/launch4j/bin/windres-macosx differ diff --git a/java/application/launch4j/head/consolehead.o b/java/application/launch4j/head/consolehead.o index 60bb62f66..78593071b 100644 Binary files a/java/application/launch4j/head/consolehead.o and b/java/application/launch4j/head/consolehead.o differ diff --git a/java/application/launch4j/head/guihead.o b/java/application/launch4j/head/guihead.o index 7cff13221..689e7c2ab 100644 Binary files a/java/application/launch4j/head/guihead.o and b/java/application/launch4j/head/guihead.o differ diff --git a/java/application/launch4j/head/head.o b/java/application/launch4j/head/head.o index d5d63d666..95f051e3e 100644 Binary files a/java/application/launch4j/head/head.o and b/java/application/launch4j/head/head.o differ diff --git a/java/application/launch4j/launch4j.jar b/java/application/launch4j/launch4j.jar index 6daad70f7..21ba2adc1 100644 Binary files a/java/application/launch4j/launch4j.jar and b/java/application/launch4j/launch4j.jar differ diff --git a/java/application/launch4j/lib/LICENSE.txt b/java/application/launch4j/lib/LICENSE.txt index 4848b3e4e..9bc9763eb 100644 --- a/java/application/launch4j/lib/LICENSE.txt +++ b/java/application/launch4j/lib/LICENSE.txt @@ -1,6 +1,7 @@ (BSD Style License) -Copyright (c) 2003-2004, Joe Walnes +Copyright (c) 2003-2006, Joe Walnes +Copyright (c) 2006-2019, XStream Committers All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/java/application/launch4j/lib/xstream.jar b/java/application/launch4j/lib/xstream.jar index 392e1c937..742311880 100644 Binary files a/java/application/launch4j/lib/xstream.jar and b/java/application/launch4j/lib/xstream.jar differ diff --git a/java/application/launch4j/w32api/crt2.o b/java/application/launch4j/w32api/crt2.o index f81f836cf..4f5f3be7d 100644 Binary files a/java/application/launch4j/w32api/crt2.o and b/java/application/launch4j/w32api/crt2.o differ diff --git a/java/application/launch4j/w32api/libadvapi32.a b/java/application/launch4j/w32api/libadvapi32.a index c471853c7..21a8d7b00 100644 Binary files a/java/application/launch4j/w32api/libadvapi32.a and b/java/application/launch4j/w32api/libadvapi32.a differ diff --git a/java/application/launch4j/w32api/libgcc.a b/java/application/launch4j/w32api/libgcc.a index d3f89479e..f98edb83f 100644 Binary files a/java/application/launch4j/w32api/libgcc.a and b/java/application/launch4j/w32api/libgcc.a differ diff --git a/java/application/launch4j/w32api/libkernel32.a b/java/application/launch4j/w32api/libkernel32.a index 5d3eb074f..03ee7cdce 100644 Binary files a/java/application/launch4j/w32api/libkernel32.a and b/java/application/launch4j/w32api/libkernel32.a differ diff --git a/java/application/launch4j/w32api/libmingw32.a b/java/application/launch4j/w32api/libmingw32.a index d1f7888d8..d849b85e9 100644 Binary files a/java/application/launch4j/w32api/libmingw32.a and b/java/application/launch4j/w32api/libmingw32.a differ diff --git a/java/application/launch4j/w32api/libmingwex.a b/java/application/launch4j/w32api/libmingwex.a new file mode 100644 index 000000000..f74249257 Binary files /dev/null and b/java/application/launch4j/w32api/libmingwex.a differ diff --git a/java/application/launch4j/w32api/libmoldname.a b/java/application/launch4j/w32api/libmoldname.a new file mode 100644 index 000000000..21897dae4 Binary files /dev/null and b/java/application/launch4j/w32api/libmoldname.a differ diff --git a/java/application/launch4j/w32api/libmsvcrt.a b/java/application/launch4j/w32api/libmsvcrt.a index 6714146b6..be8ae31e5 100644 Binary files a/java/application/launch4j/w32api/libmsvcrt.a and b/java/application/launch4j/w32api/libmsvcrt.a differ diff --git a/java/application/launch4j/w32api/libshell32.a b/java/application/launch4j/w32api/libshell32.a index d35fbdaf3..efdd8bcc7 100644 Binary files a/java/application/launch4j/w32api/libshell32.a and b/java/application/launch4j/w32api/libshell32.a differ diff --git a/java/application/launch4j/w32api/libuser32.a b/java/application/launch4j/w32api/libuser32.a index 387fb650d..cbddae69e 100644 Binary files a/java/application/launch4j/w32api/libuser32.a and b/java/application/launch4j/w32api/libuser32.a differ diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java index 152ad14af..4451174c9 100644 --- a/java/src/processing/mode/java/JavaBuild.java +++ b/java/src/processing/mode/java/JavaBuild.java @@ -49,7 +49,7 @@ public class JavaBuild { "(?:^|\\s|;)package\\s+(\\S+)\\;"; static public final String JAVA_DOWNLOAD_URL = "https://adoptopenjdk.net/"; - static public final String MIN_JAVA_VERSION = "11.0.8"; + static public final String MIN_JAVA_VERSION = "11.0.11"; protected Sketch sketch; protected Mode mode; @@ -883,6 +883,7 @@ public class JavaBuild { } else if (exportPlatform == PConstants.WINDOWS) { File buildFile = new File(destFolder, "launch4j-build.xml"); + System.out.println(buildFile); File configFile = new File(destFolder, "launch4j-config.xml"); XML project = new XML("project"); diff --git a/todo.txt b/todo.txt index c461056db..0e87fb661 100755 --- a/todo.txt +++ b/todo.txt @@ -22,7 +22,7 @@ X https://developer.apple.com/documentation/bundleresources/entitlements/com_a X https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_device_camera X https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_device_microphone X https://github.com/processing/processing4/commit/7b75acf2799f61c9c22233f38ee73c07635cea14 - +X update to launch4j 3.14, fixing Export to Application on Windows _ make sure we're not embedding webkit with all JFX apps _ check FX2D applications on Windows and Linux