diff --git a/processing/build/linux/.cvsignore b/processing/build/linux/.cvsignore index 775565e7a..8d4921dba 100644 --- a/processing/build/linux/.cvsignore +++ b/processing/build/linux/.cvsignore @@ -1,2 +1,4 @@ work +processing-*.tgz + diff --git a/processing/build/linux/dist.sh b/processing/build/linux/dist.sh new file mode 100755 index 000000000..8099f5ca1 --- /dev/null +++ b/processing/build/linux/dist.sh @@ -0,0 +1,61 @@ +#!/bin/sh + +REVISION=`head -c 4 ../../../todo.txt` + +./make.sh + +echo Creating linux distribution for revision $REVISION... + +# remove any old boogers +rm -rf processing +rm -f processing-*.tgz + +# use 'shared' files as starting point +cp -r ../shared processing +# something like the following might be better: +# find / -name "*.mp3" -exec rm -f {}\; +# and same for cvsignore +rm -rf processing/CVS +rm -rf processing/lib/CVS +rm -rf processing/fonts/CVS +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 +# will need to add a zillion of these for the reference.. + +# add java (jre) files +#tar --extract --verbose --file=jre.tgz --ungzip --directory=processing +tar --extract --file=jre.tgz --ungzip --directory=processing + +# directories used by the app +mkdir processing/lib/build + +# grab pde.jar and export from the working dir +cp work/lib/pde.jar processing/lib/ +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 dist/Proce55ing processing/ +cp dist/lib/pde.properties_linux processing/lib/ + +# make sure notes.txt is unix LFs +# the 2> is because the app is a little chatty +dos2unix processing/notes.txt 2> /dev/null +dos2unix processing/lib/pde.properties 2> /dev/null +dos2unix processing/lib/pde.properties_windows 2> /dev/null + +# zip it all up for release +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 + +echo Done. \ No newline at end of file diff --git a/processing/build/linux/dist/Proce55ing b/processing/build/linux/dist/Proce55ing new file mode 100755 index 000000000..085f70103 --- /dev/null +++ b/processing/build/linux/dist/Proce55ing @@ -0,0 +1,3 @@ +#!/bin/sh + +./java/bin/java -cp lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar PdeBase diff --git a/processing/build/linux/make.sh b/processing/build/linux/make.sh index c131f7bb5..c01345971 100755 --- a/processing/build/linux/make.sh +++ b/processing/build/linux/make.sh @@ -7,7 +7,7 @@ if test -d work then else - echo Setting up directories to build P5... + echo Setting up directories to build for linux... mkdir work tar --extract --verbose --file=jre.tgz --ungzip --directory=work cp -r ../shared/lib work/ diff --git a/processing/build/windows/dist.sh b/processing/build/windows/dist.sh index e2d22f366..36f7b0030 100755 --- a/processing/build/windows/dist.sh +++ b/processing/build/windows/dist.sh @@ -1,11 +1,6 @@ #!/bin/sh -REVISION=`head -c 4 ../shared/../../../todo.txt` - -#if ($1 == '') then -# echo usage: ./make.sh NNNN, with version number as NNNN -# exit -#fi +REVISION=`head -c 4 ../../../todo.txt` ./make.sh @@ -42,8 +37,9 @@ 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 dist/Proce55ing.bat processing/ +#cp dist/run.bat processing/ +#cp dist/run95.bat processing/ cp dist/lib/pde.properties_windows processing/lib/ # convert notes.txt to windows LFs diff --git a/processing/build/windows/dist/run.bat b/processing/build/windows/dist/Proce55ing.bat similarity index 97% rename from processing/build/windows/dist/run.bat rename to processing/build/windows/dist/Proce55ing.bat index c19da23e3..ae0a7483b 100755 --- a/processing/build/windows/dist/run.bat +++ b/processing/build/windows/dist/Proce55ing.bat @@ -1,2 +1,2 @@ -@echo off -.\java\bin\java -cp lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\oro.jar PdeBase +@echo off +.\java\bin\java -cp lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\oro.jar PdeBase