diff --git a/android/done.txt b/android/done.txt index 3ab40eed0..fd7198a31 100644 --- a/android/done.txt +++ b/android/done.txt @@ -1,3 +1,8 @@ +0201 android (2.0a2) +X lots of updates to PGraphics et al, especially on the 3D side +X change export menu/key/toolbar ordering + + 0200 android X fix BufferedHttpEntity problem X was trying to allocate a byte buffer for entire size of HTTP file diff --git a/android/todo.txt b/android/todo.txt index e3129e3ec..527b5af1c 100644 --- a/android/todo.txt +++ b/android/todo.txt @@ -1,6 +1,4 @@ -0201 android -X lots of updates to PGraphics et al, especially on the 3D side -X change export menu/key/toolbar ordering +0202 android _ if a sketch asks for android mode but it's not available diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index a710de57f..7022a76e8 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -50,9 +50,9 @@ import processing.core.*; * files and images, etc) that comes from that. */ public class Base { - static public final int REVISION = 201; + static public final int REVISION = 202; /** This might be replaced by main() if there's a lib/version.txt file. */ - static public String VERSION_NAME = "0201"; + static public String VERSION_NAME = "0202"; /** Set true if this a proper release rather than a numbered revision. */ static public boolean RELEASE = false; /** True if heavy debugging error/log messages are enabled */ @@ -96,13 +96,13 @@ public class Base { // A single instance of the preferences window Preferences preferencesFrame; - + // A single instance of the library manager window ContributionManagerDialog libraryManagerFrame; ContributionManagerDialog toolManagerFrame; ContributionManagerDialog modeManagerFrame; ContributionManagerDialog updateManagerFrame; - + // set to true after the first time the menu is built. // so that the errors while building don't show up again. boolean builtOnce; @@ -320,13 +320,13 @@ public class Base { private void buildCoreModes() { - defaultMode = + defaultMode = ModeContribution.getCoreMode(this, "processing.mode.java.JavaMode", getContentFile("modes/java")); - Mode androidMode = + Mode androidMode = ModeContribution.getCoreMode(this, "processing.mode.android.AndroidMode", getContentFile("modes/android")); - Mode javaScriptMode = + Mode javaScriptMode = ModeContribution.getCoreMode(this, "processing.mode.javascript.JavaScriptMode", getContentFile("modes/javascript")); @@ -340,7 +340,7 @@ public class Base { if (contribModes == null) contribModes = new ArrayList(); - ArrayList newContribs = + ArrayList newContribs = ModeContribution.list(this, getSketchbookModesFolder()); for (ModeContribution contrib : newContribs) { if (!contribModes.contains(contrib)) { @@ -394,11 +394,11 @@ public class Base { if (contrib instanceof InstalledContribution) { return ContributionListing.getInstance().hasUpdates(contrib); } - + return false; } }); - + // Make sure ThinkDifferent has library examples too defaultMode.rebuildLibraryList(); @@ -1587,14 +1587,14 @@ public class Base { libraryManagerFrame.showFrame(activeEditor); // Contribution.Type.LIBRARY } - + /** * Show the tool installer window. */ public void handleOpenToolManager() { toolManagerFrame.showFrame(activeEditor); } - + /** * Show the mode installer window. */ @@ -1645,6 +1645,9 @@ public class Base { } static public int getNativeBits() { + if (Base.isMacOS()) { + return Preferences.getInteger("run.options.bits"); + } return nativeBits; } @@ -1782,7 +1785,7 @@ public class Base { * Create a temporary folder by using the createTempFile() mechanism, * deleting the file it creates, and making a folder using the location * that was provided. - * + * * Unlike createTempFile(), there is no minimum size for prefix. If * prefix is less than 3 characters, the remaining characters will be * filled with underscores @@ -2455,7 +2458,7 @@ public class Base { } return outgoing; } - + static public void readSettings(String fileName, String lines[], HashMap exports) { for (int i = 0; i < lines.length; i++) { diff --git a/app/src/processing/app/Library.java b/app/src/processing/app/Library.java index 648435082..c6552514f 100644 --- a/app/src/processing/app/Library.java +++ b/app/src/processing/app/Library.java @@ -103,17 +103,20 @@ public class Library extends InstalledContribution { // for the host platform, need to figure out what's available File nativeLibraryFolder = libraryFolder; String hostPlatform = Base.getPlatformName(); +// System.out.println("1 native lib folder now " + nativeLibraryFolder); // see if there's a 'windows', 'macosx', or 'linux' folder File hostLibrary = new File(libraryFolder, hostPlatform); if (hostLibrary.exists()) { nativeLibraryFolder = hostLibrary; } +// System.out.println("2 native lib folder now " + nativeLibraryFolder); // check for bit-specific version, e.g. on windows, check if there // is a window32 or windows64 folder (on windows) hostLibrary = new File(libraryFolder, hostPlatform + Base.getNativeBits()); if (hostLibrary.exists()) { nativeLibraryFolder = hostLibrary; } +// System.out.println("3 native lib folder now " + nativeLibraryFolder); // save that folder for later use nativeLibraryPath = nativeLibraryFolder.getAbsolutePath(); diff --git a/core/done.txt b/core/done.txt index 1a679e46c..5e18029b9 100644 --- a/core/done.txt +++ b/core/done.txt @@ -1,3 +1,13 @@ +0201 core (2.0a2) +o moviemaker built into core to write uncompressed frames? or PNG? +X doing this via a tool instead +X on resize, call redraw() when noLoop() is used +o need to add this to the docs +X was already in the documentation.. +o add inputPath() +X remove inputPath() + + 0200 core X remove textMode(SCREEN) X added expand(long) and expand(double) because of Table diff --git a/core/todo.txt b/core/todo.txt index 95f999ac5..4dfe4131e 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -1,11 +1,5 @@ -0201 core -o moviemaker built into core to write uncompressed frames? or PNG? -X doing this via a tool instead -X on resize, call redraw() when noLoop() is used -o need to add this to the docs -X was already in the documentation.. -o add inputPath() -X remove inputPath() +0202 core + _ add inputPath() and outputPath() -> sketch folder or sd card diff --git a/done.txt b/done.txt index bf9d45f04..634b9416a 100644 --- a/done.txt +++ b/done.txt @@ -1,3 +1,29 @@ +0201 pde (2.0a2) +X implement movie maker tool +X http://code.google.com/p/processing/issues/detail?id=836 +X add movie maker tool to the build scripts +X swap order of applet/application in the file menu +X update Quaqua to 7.4.2 +X make application the default instead of applet +X subfolders of windows32 & friends aren't being included (gsvideo problem) +X on Windows, move the exported DLLs et al inside 'lib' +X requires change to export/launcher.cpp to include the exe dir +X change Linux script to handle the 'lib' dir as part of the lib path +X changed Mac OS X launchers to use Java 1.6 ++ Java 1.6 required for the PDE and for exported applications +X write .bat file for windows64 application exports +_ document that this is temporary / file a bug +X gstreamer has a million DLLs, so it's gross to have them in the main fldr +o how would launch4j deal with this? +X print a message in a console when trying to export a lib for unsupported arch +X add a preferences option for whether to run in 32 or 64-bit +X gsvideo sometimes needs to run as 64 instead of 32 +X notes about bit depth +X If no bits specified (libs are all universal, or no native libs) +X then exportBits will be 0, and can be controlled via "Get Info". +X Otherwise, need to specify the bits as a VM option. + + 0200 pde X update to java 6u26 X re-upload with new version to include javac diff --git a/todo.txt b/todo.txt index 68df9aeb6..5ca1d7fa9 100644 --- a/todo.txt +++ b/todo.txt @@ -1,27 +1,6 @@ -0201 pde -X implement movie maker tool -X http://code.google.com/p/processing/issues/detail?id=836 -X add movie maker tool to the build scripts -X swap order of applet/application in the file menu -X update Quaqua to 7.4.2 -X make application the default instead of applet -X subfolders of windows32 & friends aren't being included (gsvideo problem) -X on Windows, move the exported DLLs et al inside 'lib' -X requires change to export/launcher.cpp to include the exe dir -X change Linux script to handle the 'lib' dir as part of the lib path -X changed Mac OS X launchers to use Java 1.6 -+ Java 1.6 required for the PDE and for exported applications -X write .bat file for windows64 application exports -_ document that this is temporary / file a bug -X gstreamer has a million DLLs, so it's gross to have them in the main fldr -o how would launch4j deal with this? -X print a message in a console when trying to export a lib for unsupported arch -X add a preferences option for whether to run in 32 or 64-bit -X gsvideo sometimes needs to run as 64 instead of 32 -X notes about bit depth -X If no bits specified (libs are all universal, or no native libs) -X then exportBits will be 0, and can be controlled via "Get Info". -X Otherwise, need to specify the bits as a VM option. +0202 pde +X fix problem with serial not loading on macosx + _ make note of when library is not available (serial) with error msg _ i.e. if running in 64-bit mode on OS X, can't do serial