processing-cpp
diff --git a/‎mode/CppMode.jar‎
59 Bytes b/‎mode/CppMode.jar‎
59 Bytes
diff --git a/‎scripts/rebuild-jar.py‎
Lines changed: 2 additions & 0 deletions b/‎scripts/rebuild-jar.py‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/java/CppBuild.java‎
Lines changed: 21 additions & 18 deletions b/‎src/java/CppBuild.java‎
Lines changed: 21 additions & 18 deletions
@@ -73,6 +73,8 @@ def main():
         if os.path.exists(p): _shutil.rmtree(p)
     run([gradlew, ":java:compileJava", ":java:jar", "--no-daemon"], cwd=processing4_dir)
 
+    _c2 = glob.glob(os.path.join(libs_dir, "java.jar")) + glob.glob(os.path.join(libs_dir, "java-*.jar"))
+    if _c2: java_jar = _c2[0]
     if not os.path.exists(java_jar):
         print(f"ERROR: expected jar not found at {java_jar}")
         sys.exit(1)
 
@@ -509,25 +509,28 @@ public File compile(RunnerListener listener) throws Exception {
     String  gpp       = findGpp(isWindows);
 
     int gppVer = gppMajorVersion(gpp);
-    if (gppVer > 0 && gppVer < 7) {
-      listener.statusError("g++ " + gppVer + " is too old (need 7+). See dialog.");
+    if (gppVer > 0 && gppVer < 99) { // SIMULATION
+      listener.statusError("g++ " + gppVer + " is too old — need GCC 7+ for C++17.");
       boolean isWin2 = isWindows;
-      javax.swing.SwingUtilities.invokeLater(() -> {
-        Object[] opts = {"Update g++", "Cancel"};
-        int ch = javax.swing.JOptionPane.showOptionDialog(null,
-          "<html><b>g++ " + gppVer + " is too old.</b><br><br>"
-          + "CppMode requires GCC 7 or newer for C++17 support.<br>"
-          + "Your version: <b>GCC " + gppVer + "</b><br><br>"
-          + (isWin2 ? "Click <b>Update g++</b> to download the latest portable GCC." 
-                   : "Please update g++ using your system package manager.") + "</html>",
-          "g++ Too Old",
-          javax.swing.JOptionPane.DEFAULT_OPTION,
-          javax.swing.JOptionPane.ERROR_MESSAGE,
-          null, opts, opts[0]);
-        if (ch == 0 && isWin2) {
-          try { InstallWizard.run(listener); } catch (Exception ignored2) {}
-        }
-      });
+      final int[] choice = {-1};
+      try {
+        javax.swing.SwingUtilities.invokeAndWait(() -> {
+          Object[] opts = {"Update g++", "Cancel"};
+          choice[0] = javax.swing.JOptionPane.showOptionDialog(null,
+            "<html><b>g++ " + gppVer + " is too old.</b><br><br>"
+            + "CppMode requires GCC 7 or newer for C++17 support.<br>"
+            + "Your version: <b>GCC " + gppVer + "</b><br><br>"
+            + (isWin2 ? "Click <b>Update g++</b> to download the latest portable GCC."
+                     : "Please update g++ using your system package manager.") + "</html>",
+            "g++ Too Old",
+            javax.swing.JOptionPane.DEFAULT_OPTION,
+            javax.swing.JOptionPane.ERROR_MESSAGE,
+            null, opts, opts[0]);
+        });
+      } catch (Exception ignored2) {}
+      if (choice[0] == 0 && isWin2) {
+        try { InstallWizard.run(listener); } catch (Exception ignored3) {}
+      }
       throw new Exception("g++ too old: " + gppVer);
     }