From c6957c7c18ff9dcd4e4ee055241c50f2292f0e66 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sun, 3 Aug 2003 20:28:45 +0000
Subject: [PATCH] modifying scripts for newer serial setup

---
 processing/build/windows/dist.sh |  8 +++++-
 processing/build/windows/make.sh | 46 +++++++++++++++++++++++++-------
 processing/build/windows/run.sh  | 10 ++++++-
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/processing/build/windows/dist.sh b/processing/build/windows/dist.sh
index 45d076bc2..8d9fa4d8b 100755
--- a/processing/build/windows/dist.sh
+++ b/processing/build/windows/dist.sh
@@ -61,7 +61,13 @@ chmod +x processing/jikes.exe
 cp launcher/processing.exe processing/
 cp dist/run.bat processing/
 cp dist/lib/pde_windows.properties processing/lib/
-cp dist/lib/comm.jar processing/lib/
+#cp dist/lib/comm.jar processing/lib/
+
+# get serial stuff from the bagel dir
+cp ../../bagel/serial/comm.jar processing/lib/
+cp ../../bagel/serial/javax.comm.properties processing/lib/
+cp ../../bagel/serial/win32com.dll processing/
+chmod +x processing/win32com.dll
 
 # convert notes.txt to windows LFs
 # the 2> is because the app is a little chatty
diff --git a/processing/build/windows/make.sh b/processing/build/windows/make.sh
index 93816d0e7..0bc10b7df 100755
--- a/processing/build/windows/make.sh
+++ b/processing/build/windows/make.sh
@@ -35,9 +35,13 @@ else
   unzip -q -d work jre.zip
   # cygwin requires this because of unknown weirdness
   # it was not formerly this anal retentive
-  chmod +x work/java/bin/*.exe
-  chmod +x work/java/bin/*.dll
-  chmod +x work/java/bin/client/*.dll
+  cd work/java/bin/
+  chmod -R +x *.exe *.dll
+  cd ../../..
+  pwd
+  #chmod -R +x work/java/bin/*.exe
+  #chmod +x work/java/bin/*.dll
+  #chmod +x work/java/bin/client/*.dll
 
   mkdir work/lib/export
   mkdir work/lib/build
@@ -49,7 +53,16 @@ else
   echo Compiling processing.exe
   cd launcher && make && cp processing.exe ../work/ && cd ..
 
-  echo
+  # get the serial stuff
+  echo Copying serial support from bagel dir
+  cp ../../bagel/serial/comm.jar work/lib/
+  cp ../../bagel/serial/javax.comm.properties work/lib/
+  cp ../../bagel/serial/win32com.dll work/
+  chmod +x work/win32com.dll
+
+  # get jikes and depedencies
+  gunzip < jikes.exe.gz > work/jikes.exe
+  chmod +x work/jikes.exe
 fi
 
 
@@ -88,14 +101,21 @@ fi
 # another alternative
 #QT_JAVA_PATH=../build/shared/lib/qtjava.zip
 
-CLASSPATH="..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\java\\lib\\ext\\comm.jar;${QT_JAVA_PATH}"
+# regular version
+#CLASSPATH="..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\java\\lib\\ext\\comm.jar;${QT_JAVA_PATH}"
 
-### --- make version with serial for the application
-echo Building bagel with serial, sonic and video support
-perl make.pl SERIAL SONIC VIDEO
+# new regular version
+CLASSPATH="..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar;${QT_JAVA_PATH}"
+
+# rxtx version
+#CLASSPATH="..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\java\\lib\\ext\\RXTXcomm.jar;${QT_JAVA_PATH}"
+
+# make version with serial for the application
+echo Building bagel with serial, sonic, video and jdk13 support
+perl make.pl SERIAL SONIC VIDEO JDK13
 cp classes/*.class ../build/windows/work/classes/
 
-### --- make simpler version for applet exporting
+# make simpler version for applet exporting, only 1.1 functions
 echo Building bagel for export with sonic support
 perl make.pl SONIC
 cp classes/*.class ../build/windows/work/lib/export/
@@ -109,8 +129,14 @@ echo Building PDE for JDK 1.4
 
 cd app
 
-CLASSPATH="..\\build\\windows\\work\\classes;..\\build\\windows\\work\\lib\\kjc.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\java\\lib\\ext\\comm.jar;${QT_JAVA_PATH}"
+# rxtx version
+#CLASSPATH="..\\build\\windows\\work\\classes;..\\build\\windows\\work\\lib\\kjc.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\java\\lib\\ext\\RXTXcomm.jar;${QT_JAVA_PATH}"
 
+# original version 
+#CLASSPATH="..\\build\\windows\\work\\classes;..\\build\\windows\\work\\lib\\kjc.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\java\\lib\\ext\\comm.jar;${QT_JAVA_PATH}"
+
+# new javax.comm location
+CLASSPATH="..\\build\\windows\\work\\classes;..\\build\\windows\\work\\lib\\kjc.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar;${QT_JAVA_PATH}"
 
 # version for javac/1.1 testing
 #CLASSPATH="..\\build\\windows\\work\\classes;..\\build\\windows\\work\\lib\\kjc.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\java\\lib\\ext\\comm.jar;..\\build\\macos9\\JDKClasses.zip;..\\build\\macos9\\JDKToolsClasses.zip"
diff --git a/processing/build/windows/run.sh b/processing/build/windows/run.sh
index 0f0b7083c..2ffa4e3a4 100644
--- a/processing/build/windows/run.sh
+++ b/processing/build/windows/run.sh
@@ -11,10 +11,18 @@ fi
 # another alternative
 #QT_JAVA_PATH=..\\build\\shared\\lib\\qtjava.zip
 
+# rxtx testing
+#CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}
 
-CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar\;${QT_JAVA_PATH}
+# newer javax.comm version
+#CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;lib\\comm.jar\;${QT_JAVA_PATH}
+CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}
+
+# javax.comm version
+#CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar\;${QT_JAVA_PATH}
 
 # version for javac/1.1 testing
 #CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar\;${QT_JAVA_PATH}\;..\\..\\macos9\\JDKClasses.zip\;..\\..\\macos9\\JDKToolsClasses.zip
 
+#cd work && ./java/bin/java -cp ${CLASSPATH} PdeBase
 cd work && ./java/bin/java -cp ${CLASSPATH} PdeBase