diff --git a/processing/app/PdeBase.java b/processing/app/PdeBase.java
index 702155a22..d41f5f828 100644
--- a/processing/app/PdeBase.java
+++ b/processing/app/PdeBase.java
@@ -45,7 +45,7 @@ import com.ice.jni.registry.*;
* files and images, etc) that comes from that.
*/
public class PdeBase {
- static final String VERSION = "0075 Alpha";
+ static final String VERSION = "0076 Alpha";
static String openedAtStartup;
diff --git a/processing/build/macosx/dist.sh b/processing/build/macosx/dist.sh
index 629fb4764..465aabd65 100755
--- a/processing/build/macosx/dist.sh
+++ b/processing/build/macosx/dist.sh
@@ -83,6 +83,8 @@ cp work/lib/core.jar processing/lib/
#gunzip < dist/jikes.gz > processing/jikes
cp dist/jikes processing/
chmod a+x processing/jikes
+
+chmod a+x processing/Processing.app/Contents/MacOS/JavaApplicationStub
#cp dist/lib/pde_macosx.properties processing/lib/
diff --git a/processing/build/macosx/dist/Processing.app/Contents/Info.plist b/processing/build/macosx/dist/Processing.app/Contents/Info.plist
index 8c246cf06..9bcd74e6e 100755
--- a/processing/build/macosx/dist/Processing.app/Contents/Info.plist
+++ b/processing/build/macosx/dist/Processing.app/Contents/Info.plist
@@ -55,7 +55,7 @@
JVMVersion
1.3+
ClassPath
- $JAVAROOT/pde.jar:lib/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/oro.jar:lib/build
+ $JAVAROOT/pde.jar:lib/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/oro.jar:$JAVAROOT/registry.jar:lib/build
Properties
diff --git a/processing/build/windows/dist.sh b/processing/build/windows/dist.sh
index eb01f63af..4805cbf15 100755
--- a/processing/build/windows/dist.sh
+++ b/processing/build/windows/dist.sh
@@ -71,13 +71,6 @@ chmod +x processing/ICE_JNIRegistry.dll
# get platform-specific goodies from the dist dir
cp launcher/processing.exe processing/
cp dist/run.bat processing/
-#cp dist/lib/pde_windows.properties processing/lib/
-
-# get serial stuff from the bagel dir
-#cp ../../bagel/serial/comm.jar processing/lib/
-#cp ../../bagel/serial/javax.comm.properties processing/lib/
-#cp ../../bagel/serial/win32com.dll processing/
-#chmod +x processing/win32com.dll
# convert notes.txt to windows LFs
# the 2> is because the app is a little chatty
@@ -85,6 +78,9 @@ unix2dos processing/readme.txt 2> /dev/null
unix2dos processing/revisions.txt 2> /dev/null
unix2dos processing/lib/preferences.txt 2> /dev/null
unix2dos processing/lib/keywords.txt 2> /dev/null
+rm processing/*.bak
+rm processing/lib/*.bak
+
# remove boogers
find processing -name "*~" -exec rm -f {} ';'
diff --git a/processing/build/windows/dist/run-expert.bat b/processing/build/windows/dist/run-expert.bat
index 3ca23597e..c8f31f371 100755
--- a/processing/build/windows/dist/run-expert.bat
+++ b/processing/build/windows/dist/run-expert.bat
@@ -4,7 +4,7 @@ REM --- if you're running out of memory, change the 128m
REM --- (which means 128 megabytes) to something higher.
set SAVEDCP=%CLASSPATH%
-set CLASSPATH=lib;lib\build;lib\pde.jar;lib\core.jar;lib\antlr.jar;lib\oro.jar;lib\mrj.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
+set CLASSPATH=lib;lib\build;lib\pde.jar;lib\core.jar;lib\antlr.jar;lib\oro.jar;lib\mrj.jar;lib\registry.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
start javaw -ms128m -mx128m PdeBase
diff --git a/processing/build/windows/dist/run.bat b/processing/build/windows/dist/run.bat
index 7afef3148..3e85fb96c 100755
--- a/processing/build/windows/dist/run.bat
+++ b/processing/build/windows/dist/run.bat
@@ -6,7 +6,7 @@ REM --- (which means 128 megabytes) to something higher.
set SAVEDCP=%CLASSPATH%
set SAVEDPATH=%PATH%
-set CLASSPATH=java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\core.jar;lib\antlr.jar;lib\oro.jar;lib\mrj.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
+set CLASSPATH=java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\core.jar;lib\antlr.jar;lib\oro.jar;lib\registry.jar;lib\mrj.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
set PATH=java\bin;%PATH%
start javaw -ms128m -mx128m PdeBase
diff --git a/processing/build/windows/launcher/launcher.cpp b/processing/build/windows/launcher/launcher.cpp
index 92dfc7bda..6896f55a1 100644
--- a/processing/build/windows/launcher/launcher.cpp
+++ b/processing/build/windows/launcher/launcher.cpp
@@ -146,6 +146,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
"%s\\lib\\core.jar;"
"%s\\lib\\mrj.jar;"
"%s\\lib\\oro.jar;"
+ "%s\\lib\\registry.jar;"
"%s\\lib\\antlr.jar;"
"%s", // original CLASSPATH
@@ -163,7 +164,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
local_jre_installed ? "java\\lib\\rt.jar;" : "",
qtjava_path,
loaddir, loaddir, loaddir, loaddir,
- loaddir, loaddir, loaddir,
+ loaddir, loaddir, loaddir, loaddir,
env_classpath);
//MessageBox(NULL, cp,
diff --git a/processing/build/windows/launcher/processing.exe b/processing/build/windows/launcher/processing.exe
index ddaaa46e2..0b106d3a5 100755
Binary files a/processing/build/windows/launcher/processing.exe and b/processing/build/windows/launcher/processing.exe differ
diff --git a/processing/todo.txt b/processing/todo.txt
index 7054d2d94..0206dc08e 100644
--- a/processing/todo.txt
+++ b/processing/todo.txt
@@ -1,4 +1,8 @@
0076 pde
+X fix launcher issues on windows (didn't include registry.jar)
+X also fix run.bat and run-expert.bat
+X fix launcher issues on mac os x
+X fix Info.plist, and chmod +x JavaApplicationStub
_ get an xml library in there
_ nanoxml problems with manifest