From af5cdd6d84e25532e2386b499f6fa5ab08bff9f5 Mon Sep 17 00:00:00 2001 From: benfry Date: Sun, 1 Oct 2006 04:30:16 +0000 Subject: [PATCH] clean out bin folders when building.. eclipse was leaving boogers behind --- build/linux/make.sh | 7 +++++++ build/macosx/make.sh | 8 ++++++++ build/shared/revisions.txt | 7 ++++++- build/windows/make.sh | 9 +++++++++ todo.txt | 3 ++- 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/build/linux/make.sh b/build/linux/make.sh index 117dce29b..bd73bffec 100755 --- a/build/linux/make.sh +++ b/build/linux/make.sh @@ -71,6 +71,8 @@ export CLASSPATH perl preproc.pl ../build/linux/work/jikes -d bin +D -target 1.1 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 .. @@ -135,6 +137,7 @@ $JIKES -target 1.1 +D \ -classpath "library/RXTXcomm.jar:$CORE:$CLASSPATH" \ -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 .. mkdir -p $LIBRARIES/serial/library/ cp library/serial.jar $LIBRARIES/serial/library/ @@ -146,6 +149,7 @@ cd ../net mkdir -p bin $JIKES -target 1.1 +D -d bin src/processing/net/*.java rm -f library/net.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/net.jar processing/net/*.class && cd .. mkdir -p $LIBRARIES/net/library/ cp library/net.jar $LIBRARIES/net/library/ @@ -159,6 +163,7 @@ $JIKES -target 1.1 +D \ -classpath "library/jogl.jar:$CLASSPATH" \ -d bin src/processing/opengl/*.java rm -f library/opengl.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/opengl.jar processing/opengl/*.class && cd .. mkdir -p $LIBRARIES/opengl/library/ cp library/opengl.jar $LIBRARIES/opengl/library/ @@ -172,6 +177,7 @@ $JIKES -target 1.1 +D \ -classpath "library/itext.jar:$CLASSPATH" \ -d bin src/processing/pdf/*.java rm -f library/pdf.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/pdf.jar processing/pdf/*.class && cd .. mkdir -p $LIBRARIES/pdf/library/ cp library/pdf.jar $LIBRARIES/pdf/library/ @@ -183,6 +189,7 @@ cd ../dxf mkdir -p bin $JIKES -target 1.1 +D -d bin src/processing/dxf/*.java rm -f library/dxf.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/dxf.jar processing/dxf/*.class && cd .. mkdir -p $LIBRARIES/dxf/library/ cp library/dxf.jar $LIBRARIES/dxf/library/ diff --git a/build/macosx/make.sh b/build/macosx/make.sh index 41876428e..f7cbe15c3 100755 --- a/build/macosx/make.sh +++ b/build/macosx/make.sh @@ -83,6 +83,8 @@ perl preproc.pl mkdir -p bin ../build/macosx/work/jikes -d bin +D -target 1.1 src/processing/core/*.java #javac -d bin -source 1.3 -target 1.1 src/processing/core/*.java +find bin -name "*~" -exec rm -f {} ';' +rm -f ../build/macosx/work/lib/core.jar cd bin && zip -r0q ../../build/macosx/work/lib/core.jar processing && cd .. # head back to root "processing" dir @@ -155,6 +157,7 @@ $JIKES -target 1.1 +D \ -classpath "library/RXTXcomm.jar:$CORE:$CLASSPATH" \ -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 .. mkdir -p $LIBRARIES/serial/library/ cp library/serial.jar $LIBRARIES/serial/library/ @@ -166,6 +169,7 @@ cd ../net mkdir -p bin $JIKES -target 1.1 +D -d bin src/processing/net/*.java rm -f library/net.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/net.jar processing/net/*.class && cd .. mkdir -p $LIBRARIES/net/library/ cp library/net.jar $LIBRARIES/net/library/ @@ -187,6 +191,7 @@ $JIKES -target 1.1 +D \ -classpath "$QTJAVA:$CLASSPATH" \ -d bin src/processing/video/*.java rm -f library/video.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/video.jar processing/video/*.class && cd .. mkdir -p $LIBRARIES/video/library/ cp library/video.jar $LIBRARIES/video/library/ @@ -200,6 +205,7 @@ $JIKES -target 1.1 +D \ -classpath "library/jogl.jar:$CLASSPATH" \ -d bin src/processing/opengl/*.java rm -f library/opengl.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/opengl.jar processing/opengl/*.class && cd .. mkdir -p $LIBRARIES/opengl/library/ cp library/opengl.jar $LIBRARIES/opengl/library/ @@ -213,6 +219,7 @@ $JIKES -target 1.1 +D \ -classpath "library/itext.jar:$CLASSPATH" \ -d bin src/processing/pdf/*.java rm -f library/pdf.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/pdf.jar processing/pdf/*.class && cd .. mkdir -p $LIBRARIES/pdf/library/ cp library/pdf.jar $LIBRARIES/pdf/library/ @@ -224,6 +231,7 @@ cd ../dxf mkdir -p bin $JIKES -target 1.1 +D -d bin src/processing/dxf/*.java rm -f library/dxf.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/dxf.jar processing/dxf/*.class && cd .. mkdir -p $LIBRARIES/dxf/library/ cp library/dxf.jar $LIBRARIES/dxf/library/ diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index da26769e9..8c800827a 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -7,8 +7,13 @@ releases will be super crusty. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . -ABOUT REV 0117 - XX September 2006 +ABOUT REV 0117 - 1 October 2006 +This release fixes a problem with release 0116 that made exported +sketches much larger than necessary because extra files were included. + +If this is the first release you're using since 0115 or earlier, +please read the section below that contains the release notes for 0116. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . diff --git a/build/windows/make.sh b/build/windows/make.sh index 4ec10e4c0..5d0eb14fe 100755 --- a/build/windows/make.sh +++ b/build/windows/make.sh @@ -98,6 +98,9 @@ mkdir -p bin # use this from time to time to test 1.1 savviness #/cygdrive/c/msjdk-4.0/bin/jvc /d . src/processing/core/*.java +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 .. @@ -177,6 +180,7 @@ $JIKES -target 1.1 +D \ -classpath "library\\RXTXcomm.jar;$CORE;$CLASSPATH" \ -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/serial/*.class && cd .. mkdir -p $LIBRARIES/serial/library/ cp library/serial.jar $LIBRARIES/serial/library/ @@ -188,6 +192,7 @@ cd ../net mkdir -p bin $JIKES -target 1.1 +D -d bin src/processing/net/*.java rm -f library/net.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/net.jar processing/net/*.class && cd .. mkdir -p $LIBRARIES/net/library/ cp library/net.jar $LIBRARIES/net/library/ @@ -215,6 +220,7 @@ $JIKES -target 1.1 +D \ -classpath "$QTJAVA;$CLASSPATH" \ -d bin src/processing/video/*.java rm -f library/video.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/video.jar processing/video/*.class && cd .. mkdir -p $LIBRARIES/video/library/ cp library/video.jar $LIBRARIES/video/library/ @@ -228,6 +234,7 @@ $JIKES -target 1.1 +D \ -classpath "library\\jogl.jar;$CLASSPATH" \ -d bin src/processing/opengl/*.java rm -f library/opengl.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/opengl.jar processing/opengl/*.class && cd .. mkdir -p $LIBRARIES/opengl/library/ cp library/opengl.jar $LIBRARIES/opengl/library/ @@ -241,6 +248,7 @@ $JIKES -target 1.1 +D \ -classpath "library\\itext.jar;$CLASSPATH" \ -d bin src/processing/pdf/*.java rm -f library/pdf.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/pdf.jar processing/pdf/*.class && cd .. mkdir -p $LIBRARIES/pdf/library/ cp library/pdf.jar $LIBRARIES/pdf/library/ @@ -252,6 +260,7 @@ cd ../dxf mkdir -p bin $JIKES -target 1.1 +D -d bin src/processing/dxf/*.java rm -f library/dxf.jar +find bin -name "*~" -exec rm -f {} ';' cd bin && zip -r0q ../library/dxf.jar processing/dxf/*.class && cd .. mkdir -p $LIBRARIES/dxf/library/ cp library/dxf.jar $LIBRARIES/dxf/library/ diff --git a/todo.txt b/todo.txt index 30297c0c8..4ab64dd96 100644 --- a/todo.txt +++ b/todo.txt @@ -1,5 +1,6 @@ 0117 pde -_ add PGraphicsOpenGL change to revisions.txt and the changes faq +X add PGraphicsOpenGL change to revisions.txt and the changes faq +_ have casey run an svn update of the site _ add server/client notification thing for the nyu guys