From da2e167d6350a85f35fc859eac9b7fa113a3d06f Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Mon, 22 Sep 2003 06:08:05 +0000
Subject: [PATCH] fixes for run.bat and build scripts

---
 processing/build/windows/dist.sh             |  7 ++--
 processing/build/windows/dist/run-expert.bat | 11 ++++++
 processing/build/windows/dist/run.bat        |  5 ++-
 processing/build/windows/run.sh              | 38 ++++++++++----------
 processing/build/windows/srun.sh             | 21 ++++++++++-
 5 files changed, 57 insertions(+), 25 deletions(-)
 create mode 100755 processing/build/windows/dist/run-expert.bat

diff --git a/processing/build/windows/dist.sh b/processing/build/windows/dist.sh
index 7685eb43e..d1a1fb276 100755
--- a/processing/build/windows/dist.sh
+++ b/processing/build/windows/dist.sh
@@ -89,8 +89,11 @@ zip -rq $P5.zip $P5
 # zip up another for experts
 echo Packaging expert release...
 echo
-#cp -r dist/serial $P5/
-#rm -rf $P5/serial/CVS
+
+# can't use the run.bat that's tied to a local jre
+rm $P5/run.bat
+cp dist/run-expert.bat $P5/
+
 # remove enormous java runtime
 rm -rf $P5/java
 zip -rq $P5-expert.zip $P5
diff --git a/processing/build/windows/dist/run-expert.bat b/processing/build/windows/dist/run-expert.bat
new file mode 100755
index 000000000..739f27d41
--- /dev/null
+++ b/processing/build/windows/dist/run-expert.bat
@@ -0,0 +1,11 @@
+@echo off
+
+REM --- if you need more ram, change the 64m (which means 
+REM --- 64 megabytes) to something higher. 
+
+set SAVEDCP=%CLASSPATH%
+set CLASSPATH=%CLASSPATH%;java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
+
+start javaw -ms64m -mx64m PdeBase
+
+set CLASSPATH=%SAVEDCP%
diff --git a/processing/build/windows/dist/run.bat b/processing/build/windows/dist/run.bat
index d64148f53..a0e0edde4 100755
--- a/processing/build/windows/dist/run.bat
+++ b/processing/build/windows/dist/run.bat
@@ -4,9 +4,8 @@ REM --- if you need more ram, change the 64m (which means
 REM --- 64 megabytes) to something higher. 
 
 set SAVEDCP=%CLASSPATH%
-REM set CLASSPATH=%CLASSPATH%;java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;c:\winnt\system32\qtjava.zip;c:\windows\system32\qtjava.zip
-set CLASSPATH=%CLASSPATH%;java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;%QTJAVA%
+set CLASSPATH=%CLASSPATH%;java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
 
-java -ms64m -mx64m PdeBase
+start .\java\bin\javaw -ms64m -mx64m PdeBase
 
 set CLASSPATH=%SAVEDCP%
diff --git a/processing/build/windows/run.sh b/processing/build/windows/run.sh
index dc921aca2..0b25f688b 100644
--- a/processing/build/windows/run.sh
+++ b/processing/build/windows/run.sh
@@ -1,32 +1,32 @@
 #!/bin/sh
 
-#if test -d /cygdrive/c/WINNT
-#then
-  # windows 2000 or nt
-#  QT_JAVA_PATH=C:\\WINNT\\system32\\QTJava.zip
-#else
-  # other versions of windows, including xp
-#  QT_JAVA_PATH=C:\\WINDOWS\\system32\\QTJava.zip
-#fi
-# another alternative
-#QT_JAVA_PATH=..\\build\\shared\\lib\\qtjava.zip
-
-# #$(*&@(#*$& quicktime for java
-QT_JAVA_PATH=`perl -e '$qt = $ENV{'QTJAVA'}; $qt =~ s/\"//g; print $qt'`;
+QT_JAVA_PATH="$WINDIR\\system32\\QTJava.zip"
+if test -f "${QT_JAVA_PATH}"
+then
+  #echo "Found Quicktime at $QT_JAVA_PATH"
+else 
+  QT_JAVA_PATH="$WINDIR\\system\\QTJava.zip"
+  if test -f "${QT_JAVA_PATH}"
+    echo "could not find qtjava.zip in either"
+    echo "${WINDIR}\\system32\\qtjava.zip or"
+    echo "${WINDIR}\\system\\qtjava.zip"
+    echo "quicktime for java must be installed before building."
+    exit 1;
+  then
+    #echo "Found Quicktime at $QT_JAVA_PATH"
+  else
+  fi
+fi
 
 # 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\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}\"
-
-#echo $CLASSPATH
-
 # will this one work? or do the quotes have to be chopped?
 #CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QTJAVA}
 
 # 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
+CLASSPATH=\"java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}\"
+
 cd work && ./java/bin/java PdeBase
diff --git a/processing/build/windows/srun.sh b/processing/build/windows/srun.sh
index 8e6aad88d..d81943ba9 100755
--- a/processing/build/windows/srun.sh
+++ b/processing/build/windows/srun.sh
@@ -1,6 +1,25 @@
 #!/bin/sh
 
-CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar
+QT_JAVA_PATH="$WINDIR\\system32\\QTJava.zip"
+if test -f "${QT_JAVA_PATH}"
+then
+  #echo "Found Quicktime at $QT_JAVA_PATH"
+else 
+  QT_JAVA_PATH="$WINDIR\\system\\QTJava.zip"
+  if test -f "${QT_JAVA_PATH}"
+    echo "could not find qtjava.zip in either"
+    echo "${WINDIR}\\system32\\qtjava.zip or"
+    echo "${WINDIR}\\system\\qtjava.zip"
+    echo "quicktime for java must be installed before building."
+    exit 1;
+  then
+    #echo "Found Quicktime at $QT_JAVA_PATH"
+  else
+  fi
+fi
+
+CLASSPATH=\"java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}\"
+
 export CLASSPATH
 
 cd work && ./java/bin/java -Djava.compiler=NONE PdeBase