diff --git a/processing/app/PdeBase.java b/processing/app/PdeBase.java index e7b2c27ea..0d09e23a5 100644 --- a/processing/app/PdeBase.java +++ b/processing/app/PdeBase.java @@ -380,7 +380,10 @@ public class PdeBase extends Frame menu.add(serialMenu); Menu rendererMenu = new Menu("Renderer"); +#ifdef OPENGL + // opengl support has started, but remains as yet unfinished menu.add(rendererMenu); +#endif normalItem = new CheckboxMenuItem("Normal"); rendererMenu.add(normalItem); @@ -838,7 +841,7 @@ public class PdeBase extends Frame } if (serialMenu.getItemCount() == 0) { - System.out.println("dimming serial menu"); + //System.out.println("dimming serial menu"); serialMenu.setEnabled(false); } diff --git a/processing/app/PdeEditor.java b/processing/app/PdeEditor.java index ed6374494..ce58faf53 100644 --- a/processing/app/PdeEditor.java +++ b/processing/app/PdeEditor.java @@ -39,6 +39,7 @@ import javax.swing.text.*; import com.apple.mrj.*; #endif + public class PdeEditor extends JPanel { static final String DEFAULT_PROGRAM = "// type program here\n"; diff --git a/processing/build/linux/make.sh b/processing/build/linux/make.sh index cda925654..c912be026 100755 --- a/processing/build/linux/make.sh +++ b/processing/build/linux/make.sh @@ -59,7 +59,7 @@ export CLASSPATH ### --- make version with serial for the application echo Building bagel with serial and sonic support -perl make.pl SERIAL SONIC +perl make.pl SERIAL SONIC JDK13 cp classes/*.class ../build/linux/work/classes/ ### --- make version without serial for applet exporting diff --git a/processing/build/macosx/dist.sh b/processing/build/macosx/dist.sh index ad879b866..5fad2dcd8 100755 --- a/processing/build/macosx/dist.sh +++ b/processing/build/macosx/dist.sh @@ -46,12 +46,12 @@ rm reference.zip cd .. # get package from the dist dir -cp -r dist/Proce55ing.app processing/ -rm -rf processing/Proce55ing.app/CVS -rm -rf processing/Proce55ing.app/Contents/CVS -rm -rf processing/Proce55ing.app/Contents/MacOS/CVS -rm -rf processing/Proce55ing.app/Contents/Resources/CVS -rm -rf processing/Proce55ing.app/Contents/Resources/Java/CVS +cp -r dist/Processing.app processing/ +rm -rf processing/Processing.app/CVS +rm -rf processing/Processing.app/Contents/CVS +rm -rf processing/Processing.app/Contents/MacOS/CVS +rm -rf processing/Processing.app/Contents/Resources/CVS +rm -rf processing/Processing.app/Contents/Resources/Java/CVS cp -r dist/serial processing/ rm -rf processing/serial/CVS @@ -61,7 +61,7 @@ rm -rf processing/serial/RXTX.pkg/Contents/Resources/CVS rm -rf processing/serial/RXTX.pkg/Contents/Resources/English.lproj/CVS # put jar files into the resource dir, leave the rest in lib -RES=processing/Proce55ing.app/Contents/Resources/Java/ +RES=processing/Processing.app/Contents/Resources/Java/ mv processing/lib/*.jar $RES/ #cp comm.jar $RES/ #cp ../shared/dist/lib/*.jar $RES/ @@ -78,7 +78,6 @@ rm -rf processing/lib/export/CVS # get platform-specific goodies from the dist dir cp `which jikes` processing -#cp dist/Proce55ing processing/ cp dist/lib/pde_macosx.properties processing/lib/ #cp dist/lib/comm.jar processing/lib/ diff --git a/processing/build/macosx/make.sh b/processing/build/macosx/make.sh index 27335475d..b56ca81d6 100755 --- a/processing/build/macosx/make.sh +++ b/processing/build/macosx/make.sh @@ -36,13 +36,14 @@ else echo fi -if test -f /System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar -then - echo -else -# echo Copying comm.jar into the machine's classpath - sudo cp comm.jar /System/Library/Frameworks/JavaVM.framework/Home/lib/ext/ -fi +# removing for rxtx 2.1.6 +#if test -f /System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar +#then +# echo +#else +## echo Copying comm.jar into the machine's classpath +# sudo cp comm.jar /System/Library/Frameworks/JavaVM.framework/Home/lib/ext/ +#fi ### -- START BUILDING ------------------------------------------- @@ -66,14 +67,19 @@ else fi cd bagel -MACOSX_CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/MRJToolkit.jar +# old comm.jar +#MACOSX_CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/MRJToolkit.jar + +# new rxtx comm +MACOSX_CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/MRJToolkit.jar +# need not be included CLASSPATH=$MACOSX_CLASSPATH export CLASSPATH ### --- make version with all the goodies for the application -echo Building bagel with serial, video, and audio support -perl make.pl SERIAL VIDEO SONIC OPENGL +echo Building bagel with serial, video, audio, and jdk13 support +perl make.pl SERIAL VIDEO SONIC JDK13 cp classes/*.class ../build/macosx/work/classes/ ### --- make version without serial for applet exporting @@ -89,7 +95,8 @@ cd app echo Building PDE for JDK 1.4 -CLASSPATH=../build/macosx/work/classes:../build/macosx/work/lib/kjc.jar:../build/macosx/work/lib/oro.jar:$MACOSX_CLASSPATH +# new rxtx +CLASSPATH=../build/macosx/work/classes:../build/macosx/work/lib/kjc.jar:../build/macosx/work/lib/oro.jar:../build/macosx/work/lib/RXTXcomm.jar:$MACOSX_CLASSPATH perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d ../build/macosx/work/classes" -dJDK13 -dJDK14 -dMACOS *.java jeditsyntax/*.java diff --git a/processing/build/macosx/run.sh b/processing/build/macosx/run.sh index 510cc1bcb..410d9c842 100755 --- a/processing/build/macosx/run.sh +++ b/processing/build/macosx/run.sh @@ -1,7 +1,12 @@ #!/bin/sh # -Dcom.apple.hwaccel=false -CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:../comm.jar +# old rxtx +#CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:../comm.jar + +# rxtx 2.1.6 +CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:lib/RXTXcomm.jar + export CLASSPATH #cd work && java -Dcom.apple.awt.antialiasing=off PdeBase diff --git a/processing/build/windows/dist.sh b/processing/build/windows/dist.sh index 6b492669b..4bf52e1b8 100755 --- a/processing/build/windows/dist.sh +++ b/processing/build/windows/dist.sh @@ -88,8 +88,8 @@ zip -rq $P5.zip $P5 # zip up another for experts echo Packaging expert release... echo -cp -r dist/serial $P5/ -rm -rf $P5/serial/CVS +#cp -r dist/serial $P5/ +#rm -rf $P5/serial/CVS # remove enormous java runtime rm -rf $P5/java zip -rq $P5-expert.zip $P5 diff --git a/processing/todo.txt b/processing/todo.txt index b5b31e712..4fdd42263 100644 --- a/processing/todo.txt +++ b/processing/todo.txt @@ -156,34 +156,23 @@ dh X may need horizontal scroller, or text wrap dh X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=display;num=1050328811;start=0 -i think this is completed -dh b _ present mode, click background window and front window hides -dh b _ wasn't present in jdk 1.3, focus manager changed in 1.4 -dh b _ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1050163961 -dh b _ file://localhost/D:/jdk-1.4.1_02/docs/api/java/awt/doc-files/FocusSpec.html -dh b _ focus not properly set in present mode -dh b _ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1048069821 - b _ escape key not quitting presentation mode - b _ no events seem to be coming through at all - - .................................................................. BEN'S PILE OF NEAR-IMMEDIACY (assume there's a bf next to all these) -_ perlin noise should be tested for 1d case -_ test to make sure cursor code works in vm -_ modify bagel building to include JDK13 flag -_ and behaves properly in a browser +X hide renderer menu item +X test to make sure cursor code works in vm +X modify bagel building to include JDK13 flag +o and behaves properly in a browser _ do objects need to be swing components to draw properly? _ macosx has update weirdness for non JComponent items _ probably why end of text messages under osx getting chopped? macosx -_ test to see if runtime exceptions are comign through +_ test to see if runtime exceptions are coming through _ get jikes118 in there.. also in cvs _ add note to instructions for how to use _ what's hanging the application on start in 1.4? @@ -203,12 +192,13 @@ X changed in cvs _ jikes is not properly wired to Proce55ing.app _ puts a couple dots on random lines + serial port work _ modify build scripts for rxtx on osx _ modify windows build scripts for javacomm in p5 folders _ remove additional javacomm from othe p5 folders -_ checkin serial stuff for bagel -_ rxtx is a problem in general.. how to improve installation +X checkin serial stuff for bagel +X rxtx is a problem in general.. how to improve installation X try installing serial adapter with p5 X report of a problem with the rxtx installer being bad X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1048517796;start=0 @@ -217,9 +207,9 @@ _ libs from 2.1.6 download for osx seem to work _ write script to handle installation, etc. _ (maybe do this from inside p5?) o will need to be done for gl4java as well -_ if dimming serial menu, put up another message -_ remove serial folder for windows -_ modify readme for the expert version +o if dimming serial menu, put up another message +X remove serial folder for windows +X modify readme for the expert version linux @@ -243,6 +233,20 @@ b o jikes prolly needs cygwin1.dll, and maybe cygiconv-2.dll POST-57 +_ perlin noise is broken + + +thought this was complete, but it's totally broken +dh b _ present mode, click background window and front window hides +dh b _ wasn't present in jdk 1.3, focus manager changed in 1.4 +dh b _ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1050163961 +dh b _ file://localhost/D:/jdk-1.4.1_02/docs/api/java/awt/doc-files/FocusSpec.html +dh b _ focus not properly set in present mode +dh b _ http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1048069821 + b _ escape key not quitting presentation mode + b _ no events seem to be coming through at all + + additional console fixes dh b _ clear console each time 'run' gets hit dh b _ don't actually clear, just advance by the number of lines visible @@ -317,7 +321,7 @@ bf _ http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jedit/jEdit/org/gjt/sp/j bf _ http://community.jedit.org/modules.php?op=modload&name=news&file=article&sid=225&mode=thread&order=0&thold=0 -random todos +random todos (low priority.. just notes to self) bf _ history.. add my diffs sketch bf _ look into eclipse ide a little more bf _ write p5 language spec