diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index aed62fb1f..cc9e6b619 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -863,6 +863,14 @@ public class Editor extends JFrame { JMenuItem item; item = new JMenuItem("Getting Started"); + item.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + Base.openURL("http://processing.org/learning/gettingstarted/"); + } + }); + menu.add(item); + + item = new JMenuItem("Environment"); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.showEnvironment(); diff --git a/build/linux/make.sh b/build/linux/make.sh index 2b7e9dd7a..8848a3045 100755 --- a/build/linux/make.sh +++ b/build/linux/make.sh @@ -78,7 +78,7 @@ mkdir -p bin -d bin -source 1.5 -target 1.5 src/processing/core/*.java find bin -name "*~" -exec rm -f {} ';' rm -f ../build/linux/work/lib/core.jar -cd bin && zip -rq ../../build/linux/work/lib/core.jar processing && cd .. +cd bin && zip -rq ../../build/linux/work/lib/core.jar processing/core/*.class && cd .. # back to base processing dir cd .. @@ -123,7 +123,9 @@ cd .. cd app -mkdir -p ../build/linux/work/classes +rm -rf ../build/linux/work/classes +mkdir ../build/linux/work/classes + ../build/linux/work/java/bin/java \ -cp ../build/linux/work/java/lib/tools.jar \ com.sun.tools.javac.Main \ @@ -167,7 +169,7 @@ $JAVAC \ -d bin src/processing/serial/*.java rm -f library/serial.jar find bin -name "*~" -exec rm -f {} ';' -cd bin && zip -r0q ../library/serial.jar processing && cd .. +cd bin && zip -r0q ../library/serial.jar processing/serial/*.class && cd .. mkdir -p $LIBRARIES/serial/library/ cp library/serial.jar $LIBRARIES/serial/library/ diff --git a/build/macosx/make.sh b/build/macosx/make.sh index 14e4d8a7a..9c6875eed 100755 --- a/build/macosx/make.sh +++ b/build/macosx/make.sh @@ -64,7 +64,7 @@ perl preproc.pl mkdir -p bin javac -source 1.5 -target 1.5 -d bin src/processing/core/*.java rm -f ../build/macosx/work/lib/core.jar -cd bin && zip -r0q ../../build/macosx/work/lib/core.jar processing && cd .. +cd bin && zip -r0q ../../build/macosx/work/lib/core.jar processing/core/*.class && cd .. # head back to "processing/app" cd ../app @@ -100,7 +100,8 @@ echo Building the PDE... #../build/macosx/work/jikes -target 1.3 +D -classpath ../build/macosx/work/classes:../build/macosx/work/lib/core.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/registry.jar:$CLASSPATH -d ../build/macosx/work/classes src/processing/app/*.java src/processing/app/debug/*.java src/processing/app/syntax/*.java src/processing/app/preproc/*.java src/processing/app/tools/*.java src/antlr/*.java src/antlr/java/*.java # For some reason, javac really wants this folder to exist beforehand. -mkdir -p ../build/macosx/work/classes +zip -r ../build/macosx/work/classes +mkdir ../build/macosx/work/classes # Intentionally keeping this separate from the 'bin' folder # used by eclipse so that they don't cause conflicts. @@ -149,7 +150,7 @@ $JAVAC \ -d bin src/processing/serial/*.java rm -f library/serial.jar find bin -name "*~" -exec rm -f {} ';' -cd bin && zip -r0q ../library/serial.jar processing && cd .. +cd bin && zip -r0q ../library/serial.jar processing/serial/*.class && cd .. mkdir -p $LIBRARIES/serial/library/ cp library/serial.jar $LIBRARIES/serial/library/ diff --git a/build/windows/make.sh b/build/windows/make.sh index 7f2a34eae..7cd0dd113 100755 --- a/build/windows/make.sh +++ b/build/windows/make.sh @@ -80,7 +80,7 @@ rm -f ../build/windows/work/lib/core.jar find bin -name "*~" -exec rm -f {} ';' # package this folder into core.jar -cd bin && zip -rq ../../build/windows/work/lib/core.jar processing && cd .. +cd bin && zip -rq ../../build/windows/work/lib/core.jar processing/core/*.class && cd .. # back to base processing dir cd .. @@ -135,7 +135,8 @@ fi cd app # has to be present, otherwise javac will complain of file writing errors -mkdir -p ../build/windows/work/classes +zip -r ../build/windows/work/classes +mkdir ../build/windows/work/classes ../build/windows/work/java/bin/java \ -classpath "..\\build\\windows\\work\\java\\lib\\tools.jar" \ diff --git a/core/todo.txt b/core/todo.txt index 2773fd84f..a1ff48d80 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -15,10 +15,8 @@ X http://dev.processing.org/bugs/show_bug.cgi?id=899 X finish getImage() method inside PImage X delay() is broken X http://dev.processing.org/bugs/show_bug.cgi?id=894 - - -regressions -_ remove extra ~ files from core.jar (!) +X remove extra ~ files from core.jar +X also fix for other libraries in the make scripts across platforms _ clean up setMainDrawingSurface() _ should instead be inside size(), and init(), no? @@ -26,10 +24,9 @@ _ should instead be inside size(), and init(), no? _ ortho() behaving differently in P3D vs OPENGL _ http://dev.processing.org/bugs/show_bug.cgi?id=100 -_ only happens on the first round -_ ortho() is doing things strangely +_ shows a blank canvas +_ (was only happening once b/c was drawing first in perspective) _ seems to be mapping to 0, 0 - width/2, height/2 -_ http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1115919744;start=0 [ need problem sketch ] diff --git a/todo.txt b/todo.txt index b9230feaf..ba5ea294e 100644 --- a/todo.txt +++ b/todo.txt @@ -33,6 +33,9 @@ o http://dev.processing.org/bugs/show_bug.cgi?id=905 o last fixed 5/30, maybe check the svn for those two days o this might be the MULTILINE mess X was a typo in the code +X add getting started to help menu +X http://processing.org/learning/gettingstarted/ +X add "environment" to the help menu cleanup o how to grab the java2d object from PGraphics2D @@ -47,12 +50,13 @@ o you wait for the images to download (size is zero until they're ready) o MediaTracker blocking is prolly making jar download really slow o http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1089914280 - _ do some edits on the "getting started" text -_ add getting started to help menu? + +_ command line for casey _ present mode "stop" button hops around + thread hang problem _ video capture problems with opengl _ http://dev.processing.org/bugs/show_bug.cgi?id=882