From 19dbcb32187ad9261e2bb7a55634a58a0b91846f Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Fri, 12 Aug 2016 12:17:01 -0400 Subject: [PATCH 1/3] add 2016 to about-1x and about-2x --- todo.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/todo.txt b/todo.txt index e888920b4..7ce699c37 100644 --- a/todo.txt +++ b/todo.txt @@ -15,6 +15,7 @@ _ test ext.dirs on exported app 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 +X add 2016 to about-1x and about-2x mode work X add template support for Modes @@ -92,6 +93,8 @@ _ hi-dpi support on Linux _ https://github.com/processing/processing/issues/4183 _ PDE and sketches are 2x smaller on high-res Windows machines _ https://github.com/processing/processing/issues/2411 +_ System.setProperty("sun.java2d.dpiaware", "false"); +_ though that seems broken in Java 8: http://superuser.com/a/1007783 _ Library path mismatch between processing-java and export _ https://github.com/processing/processing/issues/4493 @@ -123,8 +126,6 @@ _ setting a bad font/size causes a crash on startup _ https://github.com/processing/processing/issues/4085 o https://github.com/processing/processing/pull/4087 -_ add 2016 to about-1x and about-2x - more contribs _ question about PDE_pt-br instead of PDE_pt From c6ac69b9bc831d84d83f87fab57201d30249f91f Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Fri, 12 Aug 2016 15:52:59 -0400 Subject: [PATCH 2/3] huh, how bout that --- todo.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/todo.txt b/todo.txt index 7ce699c37..21bb1f8c7 100644 --- a/todo.txt +++ b/todo.txt @@ -17,6 +17,8 @@ X works fine on OS X, couldn't reproduce on Linux X rewrite Util.listFiles() because it wasn't working properly X add 2016 to about-1x and about-2x +_ saying "no" to save changes is the same as "cancel" on windows? + mode work X add template support for Modes X Move general PDE code out of JavaMode and into general base classes From ff831bcb258de9e6bff042a25f517e909500a5f1 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Fri, 12 Aug 2016 15:57:25 -0400 Subject: [PATCH 3/3] fix ext.dirs for each platform for export --- java/src/processing/mode/java/JavaBuild.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java index 42aa1a9f9..cc1609f65 100755 --- a/java/src/processing/mode/java/JavaBuild.java +++ b/java/src/processing/mode/java/JavaBuild.java @@ -1135,7 +1135,14 @@ public class JavaBuild { // https://github.com/processing/processing/issues/2239 runOptions.add("-Djna.nosys=true"); // https://github.com/processing/processing/issues/4608 - runOptions.add("-Djava.ext.dirs=%EXEDIR%/java/lib/ext"); + if (exportPlatform == PConstants.MACOSX) { + runOptions.add("-Djava.ext.dirs=$APP_ROOT/Contents/PlugIns/jdk" + PApplet.javaVersionName + ".jdk/Contents/Home/jre/lib/ext"); + } else if (exportPlatform == PConstants.WINDOWS) { + runOptions.add("-Djava.ext.dirs=%EXEDIR%/java/lib/ext"); + } else if (exportPlatform == PConstants.LINUX) { + runOptions.add("-Djava.ext.dirs=$APPDIR/java/lib/ext"); + } + // https://github.com/processing/processing/issues/2559 if (exportPlatform == PConstants.WINDOWS) { runOptions.add("-Djava.library.path=\"%EXEDIR%\\lib\"");