mirror of
https://github.com/processing/processing4.git
synced 2026-06-16 04:26:26 +02:00
renaming pde platform properties, making changes to dist to reflect it.
also removing CVS dirs from dist scripts for all platforms
This commit is contained in:
+3
-3
@@ -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);
|
||||
|
||||
+4
-4
@@ -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");
|
||||
|
||||
+18
-1
@@ -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
|
||||
|
||||
+19
-1
@@ -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
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
work
|
||||
processing-*.zip
|
||||
processing-*
|
||||
|
||||
|
||||
+23
-5
@@ -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...
|
||||
|
||||
Reference in New Issue
Block a user