From 9beb10e65f66eaded5d17f3d2e5987bf2c9c4985 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Mon, 27 Sep 2004 21:03:16 +0000
Subject: [PATCH] fixing up dist scripts

---
 processing/build/linux/dist.sh         |  5 +++++
 processing/build/linux/dist/processing |  2 +-
 processing/build/macosx/dist.sh        | 13 +++++++------
 processing/build/windows/dist.sh       | 18 ++++++++++++++++--
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/processing/build/linux/dist.sh b/processing/build/linux/dist.sh
index 21945096d..3dcf755d5 100755
--- a/processing/build/linux/dist.sh
+++ b/processing/build/linux/dist.sh
@@ -12,8 +12,13 @@ rm -rf processing-*
 
 # use 'shared' files as starting point
 cp -r ../shared processing
+
+# add the libraries folder with source
 cp -r ../../lib processing/libraries
 
+# doesn't work on linux, don't include it and confuse people
+rm -rf processing/libraries/video
+
 # new style examples thing ala reas
 cd processing
 unzip -q examples.zip
diff --git a/processing/build/linux/dist/processing b/processing/build/linux/dist/processing
index f635de97e..606a584c0 100755
--- a/processing/build/linux/dist/processing
+++ b/processing/build/linux/dist/processing
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CLASSPATH=java/lib/rt.jar:lib:lib/build:lib/pde.jar:lib/core.jar:lib/antlr.jar:lib/oro.jar
+CLASSPATH=java/lib/rt.jar:lib:lib/build:lib/pde.jar:lib/core.jar:lib/antlr.jar:lib/oro.jar:lib/mrj.jar
 export CLASSPATH
 
 # put the directory where this file lives in the front of the path, because
diff --git a/processing/build/macosx/dist.sh b/processing/build/macosx/dist.sh
index cd05321ca..ff476074d 100755
--- a/processing/build/macosx/dist.sh
+++ b/processing/build/macosx/dist.sh
@@ -32,11 +32,8 @@ rm -rf Processing*
 # use 'shared' files as starting point
 cp -r ../shared processing
 
-# get rid of any boogers
-rm -f processing/*~
-
-rm -rf processing/CVS
-rm -rf processing/lib/CVS
+# add the libraries folder with source
+cp -r ../../lib processing/libraries
 
 # new style examples thing ala reas
 cd processing
@@ -50,6 +47,10 @@ unzip -q reference.zip
 rm reference.zip
 cd ..
 
+# clean out the cvs entries
+find processing -name "CVS" -exec rm -rf {} ';'
+#find processing -name "CVS" -exec echo {} ';'
+
 # get serial stuff
 #cp dist/serial_setup.command processing/
 #chmod a+x processing/serial_setup.command
@@ -98,7 +99,7 @@ chmod a+x processing/jikes
 # find / -name "*.mp3" -exec rm -f {}\;
 # and same for cvsignore, ~ files, .DS_Store
 find processing -name "*~" -exec rm -f {} ';'
-#find processing -name ".DS_Store" -exec rm -f {} ';'
+#find processing -name ".DS_Store" -exec rm -f {} ';'  # one is legit
 find processing -name "._*" -exec rm -f {} ';'
 
 # zip it all up for release
diff --git a/processing/build/windows/dist.sh b/processing/build/windows/dist.sh
index 8b09a1383..2d050a40d 100755
--- a/processing/build/windows/dist.sh
+++ b/processing/build/windows/dist.sh
@@ -2,6 +2,15 @@
 
 REVISION=`head -c 4 ../../todo.txt`
 
+# check to see if the version number in the app is correct
+# so that mikkel doesn't kick my ass
+VERSIONED=`cat ../../app/PdeBase.java | grep $REVISION`
+if [ -z "$VERSIONED" ]
+then
+  echo Fix the revision number in PdeBase.java
+  exit
+fi
+
 ./make.sh
 
 echo Creating P5 distribution for revision $REVISION...
@@ -13,8 +22,9 @@ rm -rf processing-*
 
 # use 'shared' files as starting point
 cp -r ../shared processing
-rm -rf processing/CVS
-rm -rf processing/lib/CVS
+
+# add the libraries folder with source
+cp -r ../../lib processing/libraries
 
 # new style examples thing ala reas
 cd processing
@@ -34,6 +44,10 @@ chmod +x reference/environment/*.html
 rm reference.zip
 cd ..
 
+# clean out the cvs entries
+find processing -name "CVS" -exec rm -rf {} ';'
+#find processing -name "CVS" -exec echo {} ';'
+
 # add java (jre) files
 unzip -q -d processing jre.zip