From 465ca9d52defa9696dfa5f1360d9337a2eb6cd8c Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Mon, 9 Sep 2024 10:33:20 +0200 Subject: [PATCH 1/3] Add warnings on Windows and Linux AArch64 --- .../substrate/target/LinuxTargetConfiguration.java | 2 ++ .../substrate/target/WindowsTargetConfiguration.java | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java index 58248818..d3fcc07f 100644 --- a/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java +++ b/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java @@ -113,6 +113,8 @@ public LinuxTargetConfiguration(ProcessPaths paths, InternalProjectConfiguration public boolean compile() throws IOException, InterruptedException { if (isAarch64) { projectConfiguration.setUsePrismSW(true); // for now, when compiling for AArch64, we should not assume hw rendering + Logger.logSevere("Error: building a native image is not supported on Linux AArch64 with this version yet.\nPlease use GluonFX plugins up until 1.0.23"); + return false; } return super.compile(); } diff --git a/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java index 0c8378c6..3ce5b8df 100644 --- a/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java +++ b/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java @@ -205,6 +205,12 @@ private List asListOfWholeArchiveLinkFlags(List libraries) { return linkFlags; } + @Override + public boolean compile() throws IOException, InterruptedException { + Logger.logSevere("Error: building a native image is not supported on Windows with this version yet.\nPlease use GluonFX plugins up until 1.0.23"); + return false; + } + @Override public boolean link() throws IOException, InterruptedException { createIconResource(); @@ -319,7 +325,7 @@ List getAdditionalSourceFiles() { @Override public boolean createStaticLib() throws IOException, InterruptedException { - Logger.logSevere("Error: building a static image is not supported on Windows"); + Logger.logSevere("Error: building a static image is not supported on Windows yet"); return false; } From a5bdb5561519cf2fca03cfc8b237cf1195dcc802 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Mon, 9 Sep 2024 10:50:35 +0200 Subject: [PATCH 2/3] address feedback --- .../com/gluonhq/substrate/target/LinuxTargetConfiguration.java | 2 +- .../gluonhq/substrate/target/WindowsTargetConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java index d3fcc07f..7ab4be7a 100644 --- a/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java +++ b/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java @@ -113,7 +113,7 @@ public LinuxTargetConfiguration(ProcessPaths paths, InternalProjectConfiguration public boolean compile() throws IOException, InterruptedException { if (isAarch64) { projectConfiguration.setUsePrismSW(true); // for now, when compiling for AArch64, we should not assume hw rendering - Logger.logSevere("Error: building a native image is not supported on Linux AArch64 with this version yet.\nPlease use GluonFX plugins up until 1.0.23"); + Logger.logSevere("Error: Building a native image is not yet supported on Linux AArch64 with this version.\nPlease use GluonFX plugin version 1.0.23 instead."); return false; } return super.compile(); diff --git a/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java index 3ce5b8df..436871b1 100644 --- a/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java +++ b/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java @@ -207,7 +207,7 @@ private List asListOfWholeArchiveLinkFlags(List libraries) { @Override public boolean compile() throws IOException, InterruptedException { - Logger.logSevere("Error: building a native image is not supported on Windows with this version yet.\nPlease use GluonFX plugins up until 1.0.23"); + Logger.logSevere("Building a native image is not yet supported on Windows with this version.\nPlease use GluonFX plugin version 1.0.23 instead."); return false; } From a9e04a88a6dff0284c3199f3ea393ffb822d8bcd Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Mon, 9 Sep 2024 15:17:02 +0200 Subject: [PATCH 3/3] Address feedback --- .../gluonhq/substrate/target/WindowsTargetConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java index 436871b1..f9e585cb 100644 --- a/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java +++ b/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java @@ -207,7 +207,7 @@ private List asListOfWholeArchiveLinkFlags(List libraries) { @Override public boolean compile() throws IOException, InterruptedException { - Logger.logSevere("Building a native image is not yet supported on Windows with this version.\nPlease use GluonFX plugin version 1.0.23 instead."); + Logger.logSevere("Error: Building a native image is not yet supported on Windows with this version.\nPlease use GluonFX plugin version 1.0.23 instead."); return false; }