tweaks and testing for ext.dirs handling

benfry · benfry · commit 2fdd11b5b94b · 2016-08-12T15:27:18.000-04:00
diff --git 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=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
@@ -27,7 +27,7 @@
   <jre>
     <path>java</path>
     <!-- Deal with jokers who install JOGL, ANTLR, etc system-wide -->
-    <opt>-Djava.ext.dirs=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
@@ -1135,7 +1135,7 @@ protected boolean exportApplication(File destFolder,
     // https://github.com/processing/processing/issues/2239
     runOptions.add("-Djna.nosys=true");
     // https://github.com/processing/processing/issues/4608
-    runOptions.add("-Djava.ext.dirs=lib/ext");
+    runOptions.add("-Djava.ext.dirs=%EXEDIR%/java/lib/ext");
     // https://github.com/processing/processing/issues/2559
     if (exportPlatform == PConstants.WINDOWS) {
       runOptions.add("-Djava.library.path=\"%EXEDIR%\\lib\"");
diff --git a/todo.txt b/todo.txt
@@ -10,8 +10,8 @@ X   https://github.com/processing/processing/issues/4128
 X   https://github.com/processing/processing/issues/4503
 _   test ext.dirs working on Linux (use js example)
 _   test ext.dirs on exported app on Linux
-_   test ext.dirs working on Windows (use js example)
-_   test ext.dirs on exported app on Windows
+X   test ext.dirs working on Windows (use js example)
+X   modify ext.dirs for exported apps on Windows
 X see if CLASSPATH can be set to screw up p5
 X   works fine on OS X, couldn't reproduce on Linux
 X rewrite Util.listFiles() because it wasn't working properly
