diff --git a/processing/app/PdeBase.java b/processing/app/PdeBase.java index 5a3442b79..0c8817043 100644 --- a/processing/app/PdeBase.java +++ b/processing/app/PdeBase.java @@ -92,9 +92,11 @@ public class PdeBase implements ActionListener { //System.err.println("userdir = " + System.getProperty("user.dir")); if (PdeBase.platform == PdeBase.MACOSX) { - String pkg = "Proce55ing.app/Contents/Resources/Java/"; - properties.load(new FileInputStream(pkg + "pde.properties")); - properties.load(new FileInputStream(pkg + "pde.properties_macosx")); + //String pkg = "Proce55ing.app/Contents/Resources/Java/"; + //properties.load(new FileInputStream(pkg + "pde.properties")); + //properties.load(new FileInputStream(pkg + "pde.properties_macosx")); + properties.load(new FileInputStream("lib/pde.properties")); + properties.load(new FileInputStream("lib/pde.properties_macosx")); } else if (PdeBase.platform == PdeBase.MACOS9) { properties.load(new FileInputStream("lib/pde.properties")); @@ -635,8 +637,9 @@ public class PdeBase implements ActionListener { Toolkit tk = Toolkit.getDefaultToolkit(); if (PdeBase.platform == PdeBase.MACOSX) { - String pkg = "Proce55ing.app/Contents/Resources/Java/"; - image = tk.getImage(pkg + name); + //String pkg = "Proce55ing.app/Contents/Resources/Java/"; + //image = tk.getImage(pkg + name); + image = tk.getImage("lib/" + name); } else if (PdeBase.platform == PdeBase.MACOS9) { image = tk.getImage("lib/" + name); } else { diff --git a/processing/app/PdeEditor.java b/processing/app/PdeEditor.java index ed6089651..032546991 100644 --- a/processing/app/PdeEditor.java +++ b/processing/app/PdeEditor.java @@ -138,8 +138,9 @@ public class PdeEditor extends Panel { Properties skprops = new Properties(); try { if (PdeBase.platform == PdeBase.MACOSX) { - String pkg = "Proce55ing.app/Contents/Resources/Java/"; - skprops.load(new FileInputStream(pkg + "sketch.properties")); + //String pkg = "Proce55ing.app/Contents/Resources/Java/"; + //skprops.load(new FileInputStream(pkg + "sketch.properties")); + skprops.load(new FileInputStream("lib/pde.properties")); } else if (PdeBase.platform == PdeBase.MACOS9) { skprops.load(new FileInputStream("lib/pde.properties")); @@ -352,10 +353,10 @@ public class PdeEditor extends Panel { //if (program.length() != 0) { String buildPath = "lib" + File.separator + "build"; // TEMPORARY - if (PdeBase.platform == PdeBase.MACOSX) { - String pkg = "Proce55ing.app/Contents/Resources/Java/"; - buildPath = pkg + "build"; - } + //if (PdeBase.platform == PdeBase.MACOSX) { + //String pkg = "Proce55ing.app/Contents/Resources/Java/"; + //buildPath = pkg + "build"; + //} File buildDir = new File(buildPath); if (!buildDir.exists()) buildDir.mkdirs(); @@ -1246,8 +1247,9 @@ public class PdeEditor extends Panel { FileOutputStream output = null; if (PdeBase.platform == PdeBase.MACOSX) { - String pkg = "Proce55ing.app/Contents/Resources/Java/"; - output = new FileOutputStream(pkg + "sketch.properties"); + //String pkg = "Proce55ing.app/Contents/Resources/Java/"; + //output = new FileOutputStream(pkg + "sketch.properties"); + output = new FileOutputStream("lib/pde.properties"); } else if (PdeBase.platform == PdeBase.MACOS9) { output = new FileOutputStream("lib/pde.properties"); diff --git a/processing/build/macosx/make.sh b/processing/build/macosx/make.sh index 8cc5e95c3..0b3aaf7fc 100755 --- a/processing/build/macosx/make.sh +++ b/processing/build/macosx/make.sh @@ -6,7 +6,7 @@ if test -d work then else - echo Setting up directories to under Mac OS X + echo Setting up directories to build under Mac OS X cp -r ../shared work mkdir work/lib/export @@ -14,7 +14,7 @@ else mkdir work/classes - cp dist/run.bat work/ + #cp dist/run.bat work/ cp dist/lib/pde.properties_macosx work/lib/ echo @@ -65,7 +65,7 @@ echo Building PDE for JDK 1.3 CLASSPATH=build/macosx/work/classes:build/macosx/work/lib/kjc.jar:build/macosx/work/lib/oro.jar:$MACOSX_CLASSPATH -perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d build/macosx/work/classes" -dJDK13 *.java +perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d build/macosx/work/classes" -dJDK13 -dMACOS *.java cd build/macosx/work/classes rm -f ../lib/pde.jar diff --git a/processing/todo.txt b/processing/todo.txt index eb33a6700..90d48a388 100644 --- a/processing/todo.txt +++ b/processing/todo.txt @@ -11,6 +11,17 @@ X remove 'public' from beginner listener event handlers X trying to make eventlistener work X comm.jar has to be in classpath for kjc (interesting) X fixed launcher.exe because of problems in classpath +X how to make double-clickable version for osx +X might be as simple as combined jar with manifest and symlink +X jar doesn't like opening pde.properties b/c getClass fails +X app title comes up as PdeBase +X -Xdock:name property or +X com.apple.mrj.application.apple.menu.about.name (gulp) +X -XDock:icon (lowercase dock?) to set icon, or +X .icns file in the Contents/Resources of the bundle +X check tn on java runtime properties for macosx +X need fxns to test platform and java version + a _ this code is not performing correctly BImage b; // declare variable "b" of type BImage @@ -65,38 +76,29 @@ a _ or maybe just background of the awt object it sits on a _ use type/creator Pde1 a _ crashes when people click on help in top bar (same in DBN) [macos9] a _ use osx utilities to setfileinfo for .jar files etc -a _ get macutils to build under cygwin. argh. -a _ get to build under macosx? +a _ try to build macutils under osx macosx -a _ how to make double-clickable version for osx -a _ might be as simple as combined jar with manifest and symlink -a _ jar doesn't like opening pde.properties b/c getClass fails -a _ app title comes up as PdeBase -a _ -Xdock:name property or -a _ com.apple.mrj.application.apple.menu.about.name (gulp) a _ handlers for basic events a _ MRJAboutHandler (just show splash screen) a _ MRJPrefsHandler (open pde.properties in a text editor) a _ MRJQuitHandler (confirm quit, may need to be in another thread) a _ remove 'quit' from file menu a _ requires java 1.3.1 update 1 -a _ -XDock:icon (lowercase dock?) to set icon, or -a _ .icns file in the Contents/Resources of the bundle -a _ check tn on java runtime properties for macosx macos a _ MRJOpenApplicationHandler and MRJOpenDocumentHandler a _ especially the open document fella a _ under osx, app won't get doc unless app already launched a _ implement menuitem to load ref and to launch p5.net -a _ need fxns to test platform and java version +a _ MRJFileUtils.openURL(String url) throws IOException a _ dataInputStream, setUseCaches on the url to false a _ URLConnection.setUseCaches(false) a _ parent.obj.close() on the url a _ serial port code needs to be implemented a _ something that docks better to java serial api a _ check to see if lines for error messages are off +a _ set file type/creator for .pde files.. TEXTPde1 release a _ small script to remove CVS directories from a tree