From bcd7f9daf2b7e8a634729dcae9530c734b784542 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Fri, 19 Aug 2016 14:07:04 -0400
Subject: [PATCH] work on quoting of java.ext.dirs (#4623)

---
 build/windows/config-cmd.xml                     |  2 +-
 build/windows/config.xml                         |  2 +-
 java/src/processing/mode/java/JavaBuild.java     |  8 ++++----
 java/src/processing/mode/java/runner/Runner.java | 16 ++++++++++++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/build/windows/config-cmd.xml b/build/windows/config-cmd.xml
index 117abf3de..67bf1cdf0 100755
--- a/build/windows/config-cmd.xml
+++ b/build/windows/config-cmd.xml
@@ -30,7 +30,7 @@
   <jre>
     <path>java</path>
     <!-- Deal with jokers who install JOGL, ANTLR, etc system-wide -->
-    <opt>-Djava.ext.dirs=%EXEDIR%/java/lib/ext</opt>
+    <opt>-Djava.ext.dirs="%EXEDIR%/java/lib/ext"</opt>
     <!-- Prevent a user-installed JNA from conflicting with our version.
          https://github.com/processing/processing/issues/2239 -->
     <opt>-Djna.nosys=true</opt>
diff --git a/build/windows/config.xml b/build/windows/config.xml
index c95c33a82..6a376e516 100755
--- a/build/windows/config.xml
+++ b/build/windows/config.xml
@@ -27,7 +27,7 @@
   <jre>
     <path>java</path>
     <!-- Deal with jokers who install JOGL, ANTLR, etc system-wide -->
-    <opt>-Djava.ext.dirs=%EXEDIR%/java/lib/ext</opt>
+    <opt>-Djava.ext.dirs="%EXEDIR%/java/lib/ext"</opt>
     <!-- https://github.com/processing/processing/issues/2239 -->
     <opt>-Djna.nosys=true</opt>
     <!-- Because nosys is set to true, the DLL in the current working 
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
index 61c0d2113..8124cb4b3 100755
--- a/java/src/processing/mode/java/JavaBuild.java
+++ b/java/src/processing/mode/java/JavaBuild.java
@@ -956,13 +956,13 @@ public class JavaBuild {
     if (embedJava) {
       // if people don't embed Java, it might be a mess, but what can we do?
       if (exportPlatform == PConstants.MACOSX) {
-        runOptions.append("-Djava.ext.dirs=$APP_ROOT/Contents/PlugIns/jdk" +
+        runOptions.append("-Djava.ext.dirs=\"$APP_ROOT/Contents/PlugIns/jdk" +
                           PApplet.javaVersionName +
-                          ".jdk/Contents/Home/jre/lib/ext");
+                          ".jdk/Contents/Home/jre/lib/ext\"");
       } else if (exportPlatform == PConstants.WINDOWS) {
-        runOptions.append("-Djava.ext.dirs=%EXEDIR%/java/lib/ext");
+        runOptions.append("-Djava.ext.dirs=\"%EXEDIR%/java/lib/ext\"");
       } else if (exportPlatform == PConstants.LINUX) {
-        runOptions.append("-Djava.ext.dirs=$APPDIR/java/lib/ext");
+        runOptions.append("-Djava.ext.dirs=\"$APPDIR/java/lib/ext\"");
       }
     }
 
diff --git a/java/src/processing/mode/java/runner/Runner.java b/java/src/processing/mode/java/runner/Runner.java
index 1e1bd5b47..be8845a47 100644
--- a/java/src/processing/mode/java/runner/Runner.java
+++ b/java/src/processing/mode/java/runner/Runner.java
@@ -266,13 +266,25 @@ public class Runner implements MessageConsumer {
       }
     }
 
-//    params.add("-Djava.ext.dirs=nuffing");
-
     if (Preferences.getBoolean("run.options.memory")) {
       params.append("-Xms" + Preferences.get("run.options.memory.initial") + "m");
       params.append("-Xmx" + Preferences.get("run.options.memory.maximum") + "m");
     }
 
+    // Surprised this wasn't here before; added for 3.2.1
+    params.append("-Djna.nosys=true");
+
+    // Added for 3.2.1, was still using the default ext.dirs in the PDE
+    try {
+      String extPath =
+        new File(Platform.getJavaHome(), "lib/ext").getCanonicalPath();
+      // quoting this on OS X causes it to fail
+      //params.append("-Djava.ext.dirs=\"" + extPath + "\"");
+      params.append("-Djava.ext.dirs=" + extPath);
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+
     if (Platform.isMacOS()) {
       params.append("-Xdock:name=" + build.getSketchClassName());
 //      params.add("-Dcom.apple.mrj.application.apple.menu.about.name=" +