From 1f0adff610484207a55dbb0caab3b73955e5d4ac Mon Sep 17 00:00:00 2001 From: benfry Date: Wed, 20 Nov 2002 18:45:04 +0000 Subject: [PATCH] updated for new locations, finishing release 46 --- processing/build/linux/dist.sh | 79 +++++++++++++++++++++++++--------- processing/build/linux/make.sh | 14 +++--- 2 files changed, 66 insertions(+), 27 deletions(-) diff --git a/processing/build/linux/dist.sh b/processing/build/linux/dist.sh index 2914ac4a5..00768fe22 100755 --- a/processing/build/linux/dist.sh +++ b/processing/build/linux/dist.sh @@ -1,6 +1,6 @@ #!/bin/sh -REVISION=`head -c 4 ../../../todo.txt` +REVISION=`head -c 4 ../../todo.txt` ./make.sh @@ -23,25 +23,65 @@ rm -rf processing/reference/CVS rm -rf processing/reference/images/CVS rm -rf processing/sketchbook/CVS rm -rf processing/sketchbook/default/CVS -rm -f processing/sketchbook/default/.cvsignore +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 +rm -rf processing/sketchbook/examples/calculate/CVS +rm -rf processing/sketchbook/examples/calculate/calculate03/CVS +rm -rf processing/sketchbook/examples/calculate/calculate04/CVS +rm -rf processing/sketchbook/examples/calculate/calculate05/CVS +rm -rf processing/sketchbook/examples/calculate/calculate06/CVS +rm -rf processing/sketchbook/examples/calculate/calculate07/CVS +rm -rf processing/sketchbook/examples/calculate/calculate08/CVS +rm -rf processing/sketchbook/examples/color/CVS +rm -rf processing/sketchbook/examples/color/color01/CVS +rm -rf processing/sketchbook/examples/control/CVS +rm -rf processing/sketchbook/examples/control/control00/CVS +rm -rf processing/sketchbook/examples/control/control01/CVS +rm -rf processing/sketchbook/examples/control/control02/CVS +rm -rf processing/sketchbook/examples/data/CVS +rm -rf processing/sketchbook/examples/data/data00/CVS +rm -rf processing/sketchbook/examples/form/CVS +rm -rf processing/sketchbook/examples/form/form00/CVS +rm -rf processing/sketchbook/examples/form/form04/CVS +rm -rf processing/sketchbook/examples/form/form06/CVS +rm -rf processing/sketchbook/examples/gui/CVS +rm -rf processing/sketchbook/examples/gui/gui00/CVS +rm -rf processing/sketchbook/examples/image/CVS +rm -rf processing/sketchbook/examples/image/image01/CVS +rm -rf processing/sketchbook/examples/image/image01/data/CVS +rm -rf processing/sketchbook/examples/image/image02/CVS +rm -rf processing/sketchbook/examples/image/image02/data/CVS +rm -rf processing/sketchbook/examples/image/image03/CVS +rm -rf processing/sketchbook/examples/image/image03/data/CVS +rm -rf processing/sketchbook/examples/image/image08/CVS +rm -rf processing/sketchbook/examples/image/image08/data/CVS +rm -rf processing/sketchbook/examples/image/image09/CVS +rm -rf processing/sketchbook/examples/image/image09/data/CVS +rm -rf processing/sketchbook/examples/input/CVS +rm -rf processing/sketchbook/examples/input/input02/CVS +rm -rf processing/sketchbook/examples/input/input03/CVS +rm -rf processing/sketchbook/examples/input/input04/CVS +rm -rf processing/sketchbook/examples/input/input05/CVS +rm -rf processing/sketchbook/examples/input/input06/CVS +rm -rf processing/sketchbook/examples/input/input07/CVS +rm -rf processing/sketchbook/examples/input/input08/CVS +rm -rf processing/sketchbook/examples/motion/CVS +rm -rf processing/sketchbook/examples/motion/motion00/CVS +rm -rf processing/sketchbook/examples/motion/motion01/CVS +rm -rf processing/sketchbook/examples/motion/motion02/CVS +rm -rf processing/sketchbook/examples/motion/motion05/CVS +rm -rf processing/sketchbook/examples/motion/motion06/CVS +rm -rf processing/sketchbook/examples/simulate/CVS +rm -rf processing/sketchbook/examples/simulate/simulate00/CVS +rm -rf processing/sketchbook/examples/simulate/simulate01/CVS +rm -rf processing/sketchbook/examples/structure/CVS +rm -rf processing/sketchbook/examples/structure/structure00/CVS +rm -rf processing/sketchbook/examples/structure/structure01/CVS +rm -rf processing/sketchbook/examples/structure/structure04/CVS +rm -rf processing/sketchbook/examples/structure/structure05/CVS +rm -rf processing/sketchbook/examples/transform/CVS +rm -rf processing/sketchbook/examples/transform/transform05/CVS # add java (jre) files #tar --extract --verbose --file=jre.tgz --ungzip --directory=processing @@ -56,8 +96,6 @@ cp -r work/lib/export processing/lib/ rm -rf processing/lib/export/CVS # get platform-specific goodies from the dist dir -#cp dist/run.bat processing/ -#cp dist/run95.bat processing/ cp work/Proce55ing processing/ cp dist/lib/pde_linux.properties processing/lib/ @@ -73,7 +111,6 @@ echo Creating tarball and finishing... P5=processing-$REVISION mv processing $P5 tar cfz $P5.tgz $P5 -#zip -rq $P5.zip $P5 # nah, keep the new directory around #rm -rf $P5 diff --git a/processing/build/linux/make.sh b/processing/build/linux/make.sh index d640c5759..73ad61ce6 100755 --- a/processing/build/linux/make.sh +++ b/processing/build/linux/make.sh @@ -24,7 +24,7 @@ fi ### -- START BUILDING ------------------------------------------- # move to 'app' directory -cd ../.. +cd ../../app ### -- BUILD BAGEL ---------------------------------------------- @@ -45,15 +45,17 @@ cd bagel CLASSPATH=/opt/java/lib/rt.jar:/opt/java/lib/ext/comm.jar #CLASSPATH=../app/build/linux/work/java/lib/rt.jar:../app/build/linux/work/java/lib/ext/comm.jar +echo should be inside bagel dir +echo $PWD ### --- make version with serial for the application echo Building bagel with serial support perl make.pl SERIAL -cp classes/*.class ../app/build/linux/work/classes/ +cp classes/*.class ../build/linux/work/classes/ ### --- make version without serial for applet exporting echo Building bagel for export perl make.pl -cp classes/*.class ../app/build/linux/work/lib/export/ +cp classes/*.class ../build/linux/work/lib/export/ cd .. cd app @@ -63,11 +65,11 @@ cd app echo Building PDE for JDK 1.3 -CLASSPATH=build/linux/work/classes:build/linux/work/lib/kjc.jar:build/linux/work/lib/oro.jar:build/linux/work/java/lib/rt.jar:build/linux/work/java/lib/ext/comm.jar +CLASSPATH=../build/linux/work/classes:../build/linux/work/lib/kjc.jar:../build/linux/work/lib/oro.jar:../build/linux/work/java/lib/rt.jar:../build/linux/work/java/lib/ext/comm.jar -perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d build/linux/work/classes" -dJDK13 *.java +perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d ../build/linux/work/classes" -dJDK13 *.java lexer/*.java -cd build/linux/work/classes +cd ../build/linux/work/classes rm -f ../lib/pde.jar zip -0q ../lib/pde.jar *.class cd ../..