diff --git a/app/Base.java b/app/Base.java index df7efd5d8..a48156988 100644 --- a/app/Base.java +++ b/app/Base.java @@ -386,6 +386,8 @@ public class Base { } else { // on linux (or elsewhere?) prompt the user for the location JFileChooser fc = new JFileChooser(); + fc.setDialogTitle("Select the folder where " + + "Processing sketches should be stored..."); //fc.setSelectedFile(new File(sketchbookLocationField.getText())); fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); diff --git a/build/linux/dist.sh b/build/linux/dist.sh index f591c5f39..7b04173fe 100755 --- a/build/linux/dist.sh +++ b/build/linux/dist.sh @@ -14,7 +14,7 @@ rm -rf processing-* cp -r ../shared processing # add the libraries folder with source -cp -r ../../lib work/libraries +#cp -r ../../lib work/libraries cp -r ../../net work/libraries/ cp -r ../../opengl work/libraries/ cp -r ../../serial work/libraries/ diff --git a/build/linux/dist/processing b/build/linux/dist/processing index 3a70b23f5..fa5183eb2 100755 --- a/build/linux/dist/processing +++ b/build/linux/dist/processing @@ -9,14 +9,12 @@ export CLASSPATH PATH=`pwd`/`dirname $0`:`pwd`/java/bin:${PATH} export PATH -if test -l /usr/lib/libstdc++-libc6.2-2.so.3 +if test -f /usr/lib/libstdc++-libc6.2-2.so.3 then java processing.app.Base else - echo You need to install libstdc++-libc6.2-2.so.3 - echo or the rpm/package for compat-libstdc++ - echo in order to use Processing (because of jikes). - echo - echo Or if you have jikes working properly, and know - echo what you're doing, you should edit this script. + echo Processing uses jikes, which requires libstdc++-libc6.2-2.so.3 + echo You need to install it or the rpm/package for compat-libstdc++ + echo before Processing will run. Or if you have jikes working properly, + echo and know what you are doing, you should edit this script. fi diff --git a/build/linux/make.sh b/build/linux/make.sh index 8dcffeb64..7a5bc8374 100755 --- a/build/linux/make.sh +++ b/build/linux/make.sh @@ -16,7 +16,7 @@ else mkdir -p work/classes/processing/app/syntax mkdir -p work/classes/processing/app/tools - cp -r ../../lib work/libraries + #cp -r ../../lib work/libraries cp -r ../../net work/libraries/ cp -r ../../opengl work/libraries/ cp -r ../../serial work/libraries/ @@ -36,7 +36,7 @@ else #mkdir work/lib/export mkdir work/lib/build - mkdir work/classes + #mkdir work/classes # get the serial stuff #echo Copying serial support from bagel dir @@ -49,7 +49,7 @@ else cp dist/jikes work/ chmod +x work/jikes - echo + install -m 755 dist/processing work/processing fi cd ../.. @@ -81,7 +81,7 @@ cd .. echo Building PDE for JDK 1.3 -cd app/preprocessor +cd app/preproc # first build the default java goop # long path is to avoid requiring java to be in your PATH @@ -102,7 +102,7 @@ cd app CLASSPATH="../build/linux/work/lib/core.jar:../build/linux/work/lib/mrj.jar:../build/linux/work/lib/antlr.jar:../build/linux/work/lib/oro.jar:../build/linux/work/lib/registry.jar:../build/linux/work/java/lib/rt.jar" -../build/linux/work/jikes -target 1.3 +D -classpath $CLASSPATH:../build/linux/work/classes -d ../build/linux/work/classes *.java jeditsyntax/*.java preprocessor/*.java tools/*.java +../build/linux/work/jikes -target 1.3 +D -classpath $CLASSPATH:../build/linux/work/classes -d ../build/linux/work/classes *.java preproc/*.java syntax/*.java tools/*.java cd ../build/linux/work/classes rm -f ../lib/pde.jar @@ -110,14 +110,8 @@ zip -0rq ../lib/pde.jar . cd ../../../.. - ### -- BUILD LIBRARIES ------------------------------------------------ - -echo build libs for linux is incomplete... finish it -exit - - cd build/linux PLATFORM=linux @@ -154,25 +148,6 @@ mkdir -p $LIBRARIES/net/library/ cp library/net.jar $LIBRARIES/net/library/ -# VIDEO LIBRARY -echo Building video library... -QTJAVA=/System/Library/Java/Extensions/QTJava.zip -if test -f "${QTJAVA}" -then - echo "Found QuickTime for Java at $QTJAVA" -else - echo "QuickTime for Java must be installed before building." - exit 1; -fi -cd ../video -$JIKES -target 1.1 +D -classpath "$QTJAVA:$CLASSPATH" -d . *.java -rm -f library/video.jar -zip -r0q library/video.jar processing -rm -rf processing -mkdir -p $LIBRARIES/video/library/ -cp library/video.jar $LIBRARIES/video/library/ - - # OPENGL LIBRARY echo Building OpenGL library... cd ../opengl @@ -182,30 +157,3 @@ zip -r0q library/opengl.jar processing rm -rf processing mkdir -p $LIBRARIES/opengl/library/ cp library/opengl.jar $LIBRARIES/opengl/library/ - - -CLASSPATH=../$CLASSPATH -JIKES=../../build/$PLATFORM/work/jikes -CORE=../../build/$PLATFORM/work/lib/core.jar -LIBRARIES=../../build/$PLATFORM/work/libraries - - -# PARTICLES LIBRARY -#echo Build particles library... -#cd ../lib/particles -#$JIKES -target 1.1 +D -d . *.java -#rm -f library/particles.jar -#zip -r0q library/particles.jar simong -#rm -rf simong -#mkdir -p $LIBRARIES/particles/library/ -#cp library/particles.jar $LIBRARIES/particles/library/ - -pwd - - - -### -- BUILD STUB ----------------------------------------------- - -cd ../../build/linux - -install -m 755 dist/processing work/processing diff --git a/build/shared/readme.txt b/build/shared/readme.txt index f1d9aca6d..0e3f547e8 100644 --- a/build/shared/readme.txt +++ b/build/shared/readme.txt @@ -266,6 +266,10 @@ on a redhat 9 box, and sun's jre 1.4.2 is included with the download. replacing (or making a symlink to) the contents of the 'java' folder will let you tie in a preferred jvm for your machine. +the following message (or messages like it) on startup: +Warning: Cannot convert string "-b&h-lucida-medium-r-normal-sans-*-140-*-*-p-*-iso8859-1" to type FontStruct +is just a java issue, not really a problem that will affect things. + serial.. this release uses rxtx-2.1_6 (just like macosx). if you're having trouble getting things to run, i.e. the port menu stays grayed out or you get error message spew to the console when starting the diff --git a/todo.txt b/todo.txt index a37d5436d..8cd6ad050 100644 --- a/todo.txt +++ b/todo.txt @@ -31,14 +31,18 @@ o add prompt() method to Camera ("" means default, null is prompt) o let them pass in prompt(), not use null o null is only bringing up settings dialog, that's wrong -_ move packaging around -_ remove PdeXxx prefixes on names, make PdeBase into just "Processing" -_ update .exe to use new class/package -_ update .app to use new class/package +saturday afternoon +X move packaging around +X remove PdeXxx prefixes on names, make PdeBase into just "Processing" +X update .exe to use new class/package +X update .app to use new class/package +X setup linux box and build a linux version +X need to fix up the make/dist scripts for linux +X update runner script for the new package +X fix linux bugs with placement +X lots of dist script tweaking and messing with jikes libs +o should loadPixels be grabPixels? (nope) -_ setup linux box and build a linux version -_ need to fix up the make/dist scripts for linux -_ update runner script for the new package . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . @@ -47,7 +51,6 @@ pending _ get simon's new lighting code _ rename video.Camera to video.Video ? _ VideoInput VideoOutput, SoundInput, SoundOutput or AudioInput/AudioOutput -_ should loadPixels be grabPixels? non-coding tasks (for beta)