From 8dd4fe99196d0842a2da2ef2f6aac1abf74bfcbb Mon Sep 17 00:00:00 2001
From: David Cuartielles <d.cuartielles@arduino.cc>
Date: Mon, 5 Sep 2005 21:33:14 +0000
Subject: [PATCH] DojoDave - 20050905 Modified to compile and run the
 excutables in win32 from the originals by Mellis and Banzi

---
 build/windows/make.sh | 325 ++++++++++++++++++++++--------------------
 build/windows/run.sh  |  34 +----
 2 files changed, 171 insertions(+), 188 deletions(-)

diff --git a/build/windows/make.sh b/build/windows/make.sh
index a5b28813f..41fa5a896 100755
--- a/build/windows/make.sh
+++ b/build/windows/make.sh
@@ -1,157 +1,168 @@
-#!/bin/sh
-
-
-### -- SETUP WORK DIR -------------------------------------------
-
-if test -d work
-then
-  BUILD_PREPROC=false
-else
-  echo Setting up directories to build arduino...
-  BUILD_PREPROC=true
-  cp -r ../shared work
-  rm -rf work/CVS
-  rm -f work/.DS_Store 
-  
-  # needs to make the dir because of packaging goofiness
-  mkdir -p work/classes/arduino/app/preproc
-  mkdir -p work/classes/arduino/app/syntax
-  mkdir -p work/classes/arduino/app/tools
-
-
-#  echo Extracting examples...
- # cd work
-  #unzip -q examples.zip
- # rm examples.zip
- # cd ..
-
-  echo Extracting reference...
-#  cd work
-#  unzip -q reference.zip
-  # necessary for launching reference from shell/command prompt
-  # which is done internally to view reference
-  #chmod +x reference/*.html
-  # needed by 'help' menu
-  #chmod +x reference/environment/*.html
-  # chmod -R +x *.html doesn't seem to work
-
-#  rm reference.zip
- # cd ..
-
-  echo Extracting enormous JRE...
-  unzip -q -d work jre.zip
-  # cygwin requires this because of unknown weirdness
-  # it was not formerly this anal retentive
-  cd work/java/bin/
-  #chmod +x *.exe *.dll 
-  #chmod +x client/*.dll
-  cd ../../..
-
-  mkdir work/lib/build
-  #mkdir work/classes
-
-  echo Compiling arduino.exe
-  cd launcher
-  make && cp arduino.exe ../work/
-  cd ..
-
-  # get jikes and depedencies
-  cp dist/jikes.exe work/
-  #chmod +x work/jikes.exe
-
-  cp dist/ICE_JNIRegistry.dll work/
-
-  # chmod +x the crew
-  find work -name "*.dll" -exec chmod +x {} ';'
-  find work -name "*.exe" -exec chmod +x {} ';'
-  find work -name "*.html" -exec chmod +x {} ';'
-fi
-
-cd ../..
-
-
-### -- BUILD PREPROC ---------------------------------------------
-
-# i suck at shell scripting
-#if [ $1 = "preproc" ] 
-#then 
-#BUILD_PREPROC=true
-#fi
-
-if $BUILD_PREPROC
-then
-
-echo Building PDE for JDK 1.4
-
-cd app/preproc
-
-# first build the default java goop
-../../build/windows/work/java/bin/java \
-    -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool java.g
-
-# now build the pde stuff that extends the java classes
-../../build/windows/work/java/bin/java \
-    -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool \
-    -glib java.g pde.g
-
-# back to base arduino dir
-cd ../..
-
-fi
-
-
-### -- BUILD PDE ------------------------------------------------
-
-cd app
-
-CLASSPATH="..\\build\\windows\\work\\lib\\core.jar;..\\build\\windows\\work\\lib\\mrj.jar;..\\build\\windows\\work\\lib\antlr.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\lib\\registry.jar;..\\build\\windows\\work\\java\\lib\\rt.jar"
-
-# compile the code as java 1.3, so that the application will run and
-# show the user an error, rather than crapping out with some strange
-# "class not found" crap
-../build/windows/work/jikes -target 1.3 +D -classpath "$CLASSPATH;..\\build\\windows\\work/classes" -d ..\\build\\windows\\work/classes *.java preproc/*.java syntax/*.java tools/*.java
-#/cygdrive/c/jdk-1.4.2_05/bin/javac.exe -classpath $CLASSPATH -d ..\\build\\windows\\work/classes *.java jeditsyntax/*.java preprocessor/*.java
-
-cd ../build/windows/work/classes
-rm -f ../lib/pde.jar
-zip -0rq ../lib/pde.jar .
-
-# back to build/windows
-cd ../..
-
-
-### -- BUILD LIBRARIES ------------------------------------------------
-
-
-PLATFORM=windows
-
-
-CLASSPATH="..\\build\\$PLATFORM\\work\\lib\\core.jar;..\\build\\$PLATFORM\\work\\java\\lib\\rt.jar"
-JIKES=../build/$PLATFORM/work/jikes
-CORE="..\\build\\$PLATFORM\\work\\lib\\core.jar"
-LIBRARIES="..\\build\\$PLATFORM\\work\\libraries"
-
-# move to arduino/build 
-cd ..
-
-
-
-CLASSPATH="..\\..\\build\\$PLATFORM\\work\\lib\\core.jar;..\\..\\build\\$PLATFORM\\work\\java\\lib\\rt.jar"
-JIKES=../../build/$PLATFORM/work/jikes
-CORE=..\\..\\build\\$PLATFORM\\work\\lib\\core.jar
-LIBRARIES=..\\..\\build\\$PLATFORM\\work\\libraries
-
-
-# PARTICLES LIBRARY
-#echo Build particles library...
-#cd ../lib/particles
-#$JIKES -target 1.1 +D -d . *.java 
-#rm -f library/particles.jar
-#zip -r0q library/particles.jar simong
-#rm -rf simong
-#mkdir -p $LIBRARIES/particles/library/
-#cp library/particles.jar $LIBRARIES/particles/library/
-
-echo
-echo Done.
-
+#!/bin/sh
+
+
+### -- SETUP WORK DIR -------------------------------------------
+
+if test -d work
+then
+  BUILD_PREPROC=false
+else
+  echo Setting up directories to build arduino...
+  BUILD_PREPROC=true
+  cp -r ../shared work
+  rm -rf work/CVS
+  rm -f work/.DS_Store 
+  
+  # needs to make the dir because of packaging goofiness
+  mkdir -p work/classes/arduino/app/preproc
+  mkdir -p work/classes/arduino/app/syntax
+  mkdir -p work/classes/arduino/app/tools
+
+
+#  echo Extracting examples...
+ # cd work
+  #unzip -q examples.zip
+ # rm examples.zip
+ # cd ..
+
+  echo Extracting reference...
+#  cd work
+#  unzip -q reference.zip
+  # necessary for launching reference from shell/command prompt
+  # which is done internally to view reference
+  #chmod +x reference/*.html
+  # needed by 'help' menu
+  #chmod +x reference/environment/*.html
+  # chmod -R +x *.html doesn't seem to work
+
+#  rm reference.zip
+ # cd ..
+
+  echo Extracting enormous JRE...
+  unzip -q  -d work jre.zip
+  # cygwin requires this because of unknown weirdness
+  # it was not formerly this anal retentive
+  cd work/java/bin/
+  #chmod +x *.exe *.dll 
+  #chmod +x client/*.dll
+  cd ../../..
+
+  mkdir work/lib/build
+  #mkdir work/classes
+
+  echo Compiling arduino.exe
+  cd launcher
+  make && cp arduino.exe ../work/
+  cd ..
+
+  # get jikes and depedencies
+  cp dist/jikes.exe work/
+  #chmod +x work/jikes.exe
+
+  cp dist/ICE_JNIRegistry.dll work/
+  cp dist/serial/*.* work/lib/
+  mkdir work/tools
+  cp dist/avr_tools.zip .
+  echo Extracting avr tools ...
+  unzip -q  -d work avr.zip
+  rm -f avr_tools.zip
+  cp dist/tools/*.* work/tools
+  cp dist/lib/makefile.win work/Makefile
+  mkdir work/core
+  cp ../../../core/*.* work/core
+  cp dist/core/makefile.win work/core/Makefile
+
+  # chmod +x the crew
+  find work -name "*.dll" -exec chmod +x {} ';'
+  find work -name "*.exe" -exec chmod +x {} ';'
+  find work -name "*.html" -exec chmod +x {} ';'
+fi
+
+cd ../..
+
+
+### -- BUILD PREPROC ---------------------------------------------
+
+# i suck at shell scripting
+#if [ $1 = "preproc" ] 
+#then 
+#BUILD_PREPROC=true
+#fi
+
+if $BUILD_PREPROC
+then
+
+echo Building PDE for JDK 1.4
+
+cd app/preproc
+
+# first build the default java goop
+../../build/windows/work/java/bin/java \
+    -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool java.g
+
+# now build the pde stuff that extends the java classes
+../../build/windows/work/java/bin/java \
+    -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool \
+    -glib java.g pde.g
+
+# back to base arduino dir
+cd ../..
+
+fi
+
+
+### -- BUILD PDE ------------------------------------------------
+
+cd app
+
+CLASSPATH="..\\build\\windows\\work\\lib\\RXTXcomm.jar;..\\build\\windows\\work\\lib\\core.jar;..\\build\\windows\\work\\lib\\mrj.jar;..\\build\\windows\\work\\lib\antlr.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\lib\\registry.jar;..\\build\\windows\\work\\java\\lib\\rt.jar"
+
+# compile the code as java 1.3, so that the application will run and
+# show the user an error, rather than crapping out with some strange
+# "class not found" crap
+../build/windows/work/jikes -target 1.3 +D -classpath "$CLASSPATH;..\\build\\windows\\work\\classes" -d ..\\build\\windows\\work\\classes *.java preproc/*.java syntax/*.java tools/*.java
+#/cygdrive/c/jdk-1.4.2_05/bin/javac.exe -classpath $CLASSPATH -d ..\\build\\windows\\work\\classes *.java jeditsyntax/*.java preprocessor/*.java
+
+cd ../build/windows/work/classes
+rm -f ../lib/pde.jar
+zip -0rq ../lib/pde.jar .
+
+# back to build/windows
+cd ../..
+
+
+### -- BUILD LIBRARIES ------------------------------------------------
+
+
+PLATFORM=windows
+
+
+CLASSPATH="..\\build\\$PLATFORM\\work\\lib\\core.jar;..\\build\\$PLATFORM\\work\\java\\lib\\rt.jar"
+JIKES=../build/$PLATFORM/work/jikes
+CORE="..\\build\\$PLATFORM\\work\\lib\\core.jar"
+LIBRARIES="..\\build\\$PLATFORM\\work\\libraries"
+
+# move to arduino/build 
+cd ..
+
+
+
+CLASSPATH="..\\..\\build\\$PLATFORM\\work\\lib\\core.jar;..\\..\\build\\$PLATFORM\\work\\java\\lib\\rt.jar"
+JIKES=../../build/$PLATFORM/work/jikes
+CORE=..\\..\\build\\$PLATFORM\\work\\lib\\core.jar
+LIBRARIES=..\\..\\build\\$PLATFORM\\work\\libraries
+
+
+# PARTICLES LIBRARY
+#echo Build particles library...
+#cd ../lib/particles
+#$JIKES -target 1.1 +D -d . *.java 
+#rm -f library/particles.jar
+#zip -r0q library/particles.jar simong
+#rm -rf simong
+#mkdir -p $LIBRARIES/particles/library/
+#cp library/particles.jar $LIBRARIES/particles/library/
+
+echo
+echo Done.
+
diff --git a/build/windows/run.sh b/build/windows/run.sh
index a42a49cfa..697b3dd45 100644
--- a/build/windows/run.sh
+++ b/build/windows/run.sh
@@ -1,36 +1,8 @@
 #!/bin/sh
 
-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}
-
-# 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
-
-# includes jaws.jar
-#CLASSPATH=\"java\\lib\\rt.jar\;java\\lib\\jaws.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}\"
-
-CLASSPATH=\"java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\core.jar\;lib\\mrj.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\registry.jar\;${QT_JAVA_PATH}\"
+PATH=lib:$PATH
+CLASSPATH=\"java\\lib\\rt.jar\;lib\\RXTXcomm.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\mrj.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\registry.jar\"
+export PATH
 export CLASSPATH
 
 #cd work && ./java/bin/java -Xint PdeBase