diff --git a/processing/app/PdeBase.java b/processing/app/PdeBase.java index 1c8eae262..2f55cbaab 100644 --- a/processing/app/PdeBase.java +++ b/processing/app/PdeBase.java @@ -100,17 +100,17 @@ public class PdeBase implements ActionListener { //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")); + properties.load(new FileInputStream("lib/pde_macosx.properties")); } else if (PdeBase.platform == PdeBase.MACOS9) { properties.load(new FileInputStream("lib/pde.properties")); - properties.load(new FileInputStream("lib/pde.properties_macos9")); + properties.load(new FileInputStream("lib/pde_macos9.properties")); } else { // under win95, current dir not set properly // so using a relative url like "lib/" won't work properties.load(getClass().getResource("pde.properties").openStream()); - String platformProps = "pde.properties_" + platforms[platform]; + String platformProps = "pde_" + platforms[platform] + ".properties"; properties.load(getClass().getResource(platformProps).openStream()); } //properties.list(System.out); diff --git a/processing/app/PdeEditor.java b/processing/app/PdeEditor.java index 032546991..cc066f5f0 100644 --- a/processing/app/PdeEditor.java +++ b/processing/app/PdeEditor.java @@ -140,10 +140,10 @@ public class PdeEditor extends Panel { if (PdeBase.platform == PdeBase.MACOSX) { //String pkg = "Proce55ing.app/Contents/Resources/Java/"; //skprops.load(new FileInputStream(pkg + "sketch.properties")); - skprops.load(new FileInputStream("lib/pde.properties")); + skprops.load(new FileInputStream("lib/sketch.properties")); } else if (PdeBase.platform == PdeBase.MACOS9) { - skprops.load(new FileInputStream("lib/pde.properties")); + skprops.load(new FileInputStream("lib/sketch.properties")); } else { skprops.load(getClass().getResource("sketch.properties").openStream()); @@ -1249,10 +1249,10 @@ public class PdeEditor extends Panel { if (PdeBase.platform == PdeBase.MACOSX) { //String pkg = "Proce55ing.app/Contents/Resources/Java/"; //output = new FileOutputStream(pkg + "sketch.properties"); - output = new FileOutputStream("lib/pde.properties"); + output = new FileOutputStream("lib/sketch.properties"); } else if (PdeBase.platform == PdeBase.MACOS9) { - output = new FileOutputStream("lib/pde.properties"); + output = new FileOutputStream("lib/sketch.properties"); } else { // win95/98/ME doesn't set cwd properly URL url = getClass().getResource("buttons.gif"); diff --git a/processing/build/linux/dist.sh b/processing/build/linux/dist.sh index 463f06fee..e964af748 100755 --- a/processing/build/linux/dist.sh +++ b/processing/build/linux/dist.sh @@ -24,7 +24,24 @@ rm -rf processing/reference/images/CVS rm -rf processing/sketchbook/CVS rm -rf processing/sketchbook/default/CVS rm -f processing/sketchbook/default/.cvsignore -# will need to add a zillion of these for the reference.. + +rm -rf processing/sketchbook/examples/CVS +rm -rf processing/sketchbook/examples/form00/CVS +rm -rf processing/sketchbook/examples/form01/CVS +rm -rf processing/sketchbook/examples/form02/CVS +rm -rf processing/sketchbook/examples/form03/CVS +rm -rf processing/sketchbook/examples/form04/CVS +rm -rf processing/sketchbook/examples/motion00/CVS +rm -rf processing/sketchbook/examples/motion01/CVS +rm -rf processing/sketchbook/examples/motion02/CVS +rm -rf processing/sketchbook/examples/response00/CVS +rm -rf processing/sketchbook/examples/response01/CVS +rm -rf processing/sketchbook/examples/response02/CVS +rm -rf processing/sketchbook/examples/response03/CVS +rm -rf processing/sketchbook/examples/response04/CVS +rm -rf processing/sketchbook/examples/response05/CVS +rm -rf processing/sketchbook/examples/response06/CVS +rm -rf processing/sketchbook/examples/response07/CVS # add java (jre) files #tar --extract --verbose --file=jre.tgz --ungzip --directory=processing diff --git a/processing/build/linux/dist/lib/pde.properties_linux b/processing/build/linux/dist/lib/pde_linux.properties similarity index 100% rename from processing/build/linux/dist/lib/pde.properties_linux rename to processing/build/linux/dist/lib/pde_linux.properties diff --git a/processing/build/macosx/dist.sh b/processing/build/macosx/dist.sh index 7e25a2f64..d9779ebeb 100755 --- a/processing/build/macosx/dist.sh +++ b/processing/build/macosx/dist.sh @@ -28,6 +28,24 @@ rm -rf processing/sketchbook/CVS rm -rf processing/sketchbook/default/CVS rm -f processing/sketchbook/default/.cvsignore +rm -rf processing/sketchbook/examples/CVS +rm -rf processing/sketchbook/examples/form00/CVS +rm -rf processing/sketchbook/examples/form01/CVS +rm -rf processing/sketchbook/examples/form02/CVS +rm -rf processing/sketchbook/examples/form03/CVS +rm -rf processing/sketchbook/examples/form04/CVS +rm -rf processing/sketchbook/examples/motion00/CVS +rm -rf processing/sketchbook/examples/motion01/CVS +rm -rf processing/sketchbook/examples/motion02/CVS +rm -rf processing/sketchbook/examples/response00/CVS +rm -rf processing/sketchbook/examples/response01/CVS +rm -rf processing/sketchbook/examples/response02/CVS +rm -rf processing/sketchbook/examples/response03/CVS +rm -rf processing/sketchbook/examples/response04/CVS +rm -rf processing/sketchbook/examples/response05/CVS +rm -rf processing/sketchbook/examples/response06/CVS +rm -rf processing/sketchbook/examples/response07/CVS + # get package from the dist dir cp -r dist/Proce55ing.app processing/ rm -rf processing/Proce55ing.app/CVS @@ -54,7 +72,7 @@ rm -rf processing/lib/export/CVS # get platform-specific goodies from the dist dir #cp dist/Proce55ing processing/ -cp dist/lib/pde.properties_macosx processing/lib/ +cp dist/lib/pde_macosx.properties processing/lib/ #cp dist/lib/comm.jar processing/lib/ # convert notes.txt to windows LFs diff --git a/processing/build/macosx/dist/lib/pde.properties_macosx b/processing/build/macosx/dist/lib/pde_macosx.properties similarity index 100% rename from processing/build/macosx/dist/lib/pde.properties_macosx rename to processing/build/macosx/dist/lib/pde_macosx.properties diff --git a/processing/build/windows/.cvsignore b/processing/build/windows/.cvsignore index e2c53debe..fddc6e22a 100644 --- a/processing/build/windows/.cvsignore +++ b/processing/build/windows/.cvsignore @@ -1,3 +1,3 @@ work -processing-*.zip +processing-* diff --git a/processing/build/windows/dist.sh b/processing/build/windows/dist.sh index e7acca2df..95a887e3e 100755 --- a/processing/build/windows/dist.sh +++ b/processing/build/windows/dist.sh @@ -8,7 +8,7 @@ echo Creating P5 distribution for revision $REVISION... # remove any old boogers rm -rf processing -rm -f processing-*.zip +rm -rf processing-* # use 'shared' files as starting point cp -r ../shared processing @@ -23,7 +23,24 @@ rm -rf processing/reference/images/CVS rm -rf processing/sketchbook/CVS rm -rf processing/sketchbook/default/CVS rm -f processing/sketchbook/default/.cvsignore -# will need to add a zillion of these for the reference.. + +rm -rf processing/sketchbook/examples/CVS +rm -rf processing/sketchbook/examples/form00/CVS +rm -rf processing/sketchbook/examples/form01/CVS +rm -rf processing/sketchbook/examples/form02/CVS +rm -rf processing/sketchbook/examples/form03/CVS +rm -rf processing/sketchbook/examples/form04/CVS +rm -rf processing/sketchbook/examples/motion00/CVS +rm -rf processing/sketchbook/examples/motion01/CVS +rm -rf processing/sketchbook/examples/motion02/CVS +rm -rf processing/sketchbook/examples/response00/CVS +rm -rf processing/sketchbook/examples/response01/CVS +rm -rf processing/sketchbook/examples/response02/CVS +rm -rf processing/sketchbook/examples/response03/CVS +rm -rf processing/sketchbook/examples/response04/CVS +rm -rf processing/sketchbook/examples/response05/CVS +rm -rf processing/sketchbook/examples/response06/CVS +rm -rf processing/sketchbook/examples/response07/CVS # add java (jre) files unzip -q -d processing jre.zip @@ -38,13 +55,14 @@ rm -rf processing/lib/export/CVS # get platform-specific goodies from the dist dir cp dist/Proce55ing.exe processing/ -cp dist/lib/pde.properties_windows processing/lib/ +cp dist/lib/pde_windows.properties processing/lib/ # convert notes.txt to windows LFs # the 2> is because the app is a little chatty -unix2dos processing/notes.txt 2> /dev/null +unix2dos processing/readme.txt 2> /dev/null +unix2dos processing/revisions.txt 2> /dev/null unix2dos processing/lib/pde.properties 2> /dev/null -unix2dos processing/lib/pde.properties_windows 2> /dev/null +unix2dos processing/lib/pde_windows.properties 2> /dev/null # zip it all up for release echo Zipping and finishing... diff --git a/processing/build/windows/dist/lib/pde.properties_windows b/processing/build/windows/dist/lib/pde_windows.properties similarity index 100% rename from processing/build/windows/dist/lib/pde.properties_windows rename to processing/build/windows/dist/lib/pde_windows.properties