Trying desperately to get the Windows build working.

build/shared/Makefile_CygWin

@@ -1,54 +0,0 @@
-# Arduino Makefile (for Windows XP)
-# Nick Zambetti, David A. Mellis, and D. Cuartielles
-# $Id: makefile.win,v 1.10 2005/08/31 02:47:04 cuartielles Exp $
-
-# By default, this makefile uses the serial device specified by
-# Wiring (either in the Tools | Serial Port menu or the Wiring
-# preferences file in the sketchbook directory) and passed as
-# an argument to make.  To override this value, uncomment the
-# following line and change the value to the desired device.
-# SERIAL=com1
-
-# The Wiring Lite IDE runs the "compile" rule when you click the play button.
-compile:
-	-tools/rm tmp/*
-	tools/cat core/wiringlite.inc > tmp/prog.c
-	tools/cat lib/build/*.c >> tmp/prog.c
-	tools/cp core/* tmp
-	tools/cp lib/cyg*.dll tmp
-	tools/gnumake -s -C tmp
-
-# The IDE runs the "program" rule when you hit the export button.
-# The string after the colon determines the method used to 
-# program the microcontroller: program-using-bootloader,
-# program-with-isp, or program-over-parallel-port.
-program: program-using-bootloader-avrdude
-
-# This rule is for uploading code using a bootloader already on
-# the microcontroller.  It should run at the baud rate specified
-# in the bootloader's code, current 9600 baud.
-program-using-bootloader-avrdude:
-	tools/avrdude -p atmega8 -P ${SERIAL} -c stk500@9600 -V -q -U flash:w:tmp/prog.hex
-
-# This rule is for uploading code using a bootloader already on
-# the microcontroller.  It should run at the baud rate specified
-# in the bootloader's code, current 9600 baud.  On Windows, use
-# program-using-bootloader-avrdude instead, as uisp seems to have
-# problems talking to the bootloader over the serial port (though
-# it appears to work fine with a Keyspan USB-to-serial adapter).
-program-using-bootloader:
-	# cp lib/cyg*.dll .
-	tools/uisp -dprog=stk500 -dspeed=9600 -dserial=${SERIAL} -dpart=ATmega8 if=tmp/prog.hex --upload
-
-# This rule is for uploading code using an in-system programmer,
-# e.g. the one sold by Atmel.  In this case, you want to erase the
-# microcontroller, upload the code, and then verify it.
-# Atmel's isp follows the stk500 protocol and works at 115200 baud.
-program-with-isp:
-	# cp lib/cyg*.dll .
-	tools/uisp -dprog=stk500 -dspeed=115200 -dserial=${SERIAL} -dpart=ATmega8 if=tmp/prog.hex --erase --upload --verify
-
-# This rule is for uploading code using a parallel port programmer.
-program-over-parallel-port:
-	# cp lib/cyg*.dll .
-	tools/uisp -dprog=dapa -dpart=ATmega8 if=tmp/prog.hex -dlpt=0x378 --erase --upload

build/shared/Makefile_noCygWin

@@ -1,54 +0,0 @@
-# Arduino Makefile (for Windows XP)
-# Nick Zambetti, David A. Mellis, and D. Cuartielles
-# $Id: makefile.win,v 1.10 2005/08/31 02:47:04 cuartielles Exp $
-
-# By default, this makefile uses the serial device specified by
-# Wiring (either in the Tools | Serial Port menu or the Wiring
-# preferences file in the sketchbook directory) and passed as
-# an argument to make.  To override this value, uncomment the
-# following line and change the value to the desired device.
-# SERIAL=com1
-
-# The Wiring Lite IDE runs the "compile" rule when you click the play button.
-compile:
-	-tools\rm tmp/*
-	tools\cat core/wiringlite.inc > tmp/prog.c
-	tools\cat lib/build/*.c >> tmp/prog.c
-	tools\cp core/* tmp
-	tools\cp lib/cyg*.dll tmp
-	tools\gnumake -s -C tmp
-
-# The IDE runs the "program" rule when you hit the export button.
-# The string after the colon determines the method used to 
-# program the microcontroller: program-using-bootloader,
-# program-with-isp, or program-over-parallel-port.
-program: program-using-bootloader-avrdude
-
-# This rule is for uploading code using a bootloader already on
-# the microcontroller.  It should run at the baud rate specified
-# in the bootloader's code, current 9600 baud.
-program-using-bootloader-avrdude:
-	tools\avrdude -p atmega8 -P ${SERIAL} -c stk500@9600 -V -q -U flash:w:tmp/prog.hex
-
-# This rule is for uploading code using a bootloader already on
-# the microcontroller.  It should run at the baud rate specified
-# in the bootloader's code, current 9600 baud.  On Windows, use
-# program-using-bootloader-avrdude instead, as uisp seems to have
-# problems talking to the bootloader over the serial port (though
-# it appears to work fine with a Keyspan USB-to-serial adapter).
-program-using-bootloader:
-	# cp lib/cyg*.dll .
-	tools\uisp -dprog=stk500 -dspeed=9600 -dserial=${SERIAL} -dpart=ATmega8 if=tmp/prog.hex --upload
-
-# This rule is for uploading code using an in-system programmer,
-# e.g. the one sold by Atmel.  In this case, you want to erase the
-# microcontroller, upload the code, and then verify it.
-# Atmel's isp follows the stk500 protocol and works at 115200 baud.
-program-with-isp:
-	# cp lib/cyg*.dll .
-	tools\uisp -dprog=stk500 -dspeed=115200 -dserial=${SERIAL} -dpart=ATmega8 if=tmp/prog.hex --erase --upload --verify
-
-# This rule is for uploading code using a parallel port programmer.
-program-over-parallel-port:
-	# cp lib/cyg*.dll .
-	tools\uisp -dprog=dapa -dpart=ATmega8 if=tmp/prog.hex -dlpt=0x378 --erase --upload

build/windows/dist.sh

@@ -17,88 +17,80 @@ echo Creating P5 distribution for revision $REVISION...
 echo
 
 # remove any old boogers
-rm -rf processing
-rm -rf processing-*
+rm -rf arduino
+rm -rf arduino-*
 
 # use 'shared' files as starting point
-cp -r ../shared processing
-
-# add the libraries folder with source
-cp -r ../../net processing/libraries/
-cp -r ../../opengl processing/libraries/
-cp -r ../../serial processing/libraries/
-cp -r ../../video processing/libraries/
+cp -r ../shared arduino
+cp -r work/lib/targets arduino/lib
 
 # new style examples thing ala reas
-cd processing
-unzip -q examples.zip
-rm examples.zip
-cd ..
-
-# new style reference
-cd processing
-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
-# get rid of the zip file
-rm reference.zip
+cd arduino
+mkdir examples
+unzip -d examples -q dist/examples.zip
+rm dist/examples.zip
+rm -rf dist
 cd ..
 
 # add java (jre) files
-unzip -q -d processing jre.zip
+unzip -q -d arduino jre.zip
+
+# copy tools from work/
+cp -r work/tools arduino
 
 # directories used by the app
-#mkdir processing/lib/build
+#mkdir arduino/lib/build
 
 # grab pde.jar and export from the working dir
-cp work/lib/pde.jar processing/lib/
-cp work/lib/core.jar processing/lib/
-#cp -r work/lib/export processing/lib/
-#rm -rf processing/lib/export/CVS
+cp work/lib/pde.jar arduino/lib/
+cp work/java/lib/rt.jar arduino/lib/
+#cp work/lib/core.jar arduino/lib/
+#cp -r work/lib/export arduino/lib/
+#rm -rf arduino/lib/export/CVS
 
 # get jikes and depedencies
-#gunzip < dist/jikes.gz > processing/jikes.exe
-cp dist/jikes.exe processing/
-chmod +x processing/jikes.exe
+#gunzip < dist/jikes.gz > arduino/jikes.exe
+cp dist/jikes.exe arduino/
+chmod +x arduino/jikes.exe
 
-cp dist/ICE_JNIRegistry.dll processing/
-chmod +x processing/ICE_JNIRegistry.dll
+cp dist/ICE_JNIRegistry.dll arduino/
+chmod +x arduino/ICE_JNIRegistry.dll
+cp work/rxtxSerial.dll arduino/
+chmod +x arduino/rxtxSerial.dll
+cp work/*.dll arduino
+chmod +x arduino/*.dll
 
 # get platform-specific goodies from the dist dir
-cp launcher/processing.exe processing/
-cp dist/run.bat processing/
+cp launcher/arduino.exe arduino/
+#cp dist/run.bat arduino/
 
 # convert notes.txt to windows LFs
 # the 2> is because the app is a little chatty
-unix2dos processing/revisions.txt 2> /dev/null
-unix2dos processing/lib/preferences.txt 2> /dev/null
-unix2dos processing/lib/keywords.txt 2> /dev/null
-rm -f processing/*.bak
-rm -f processing/lib/*.bak
+unix2dos arduino/revisions.txt 2> /dev/null
+unix2dos arduino/lib/preferences.txt 2> /dev/null
+unix2dos arduino/lib/keywords.txt 2> /dev/null
+rm -f arduino/*.bak
+rm -f arduino/lib/*.bak
 
 # remove boogers
-find processing -name "*~" -exec rm -f {} ';'
-find processing -name ".DS_Store" -exec rm -f {} ';'
-find processing -name "._*" -exec rm -f {} ';'
-find processing -name "Thumbs.db" -exec rm -f {} ';'
+find arduino -name "*~" -exec rm -f {} ';'
+find arduino -name ".DS_Store" -exec rm -f {} ';'
+find arduino -name "._*" -exec rm -f {} ';'
+find arduino -name "Thumbs.db" -exec rm -f {} ';'
 
 # chmod +x the crew
-find processing -name "*.dll" -exec chmod +x {} ';'
-find processing -name "*.exe" -exec chmod +x {} ';'
-find processing -name "*.html" -exec chmod +x {} ';'
+find arduino -name "*.dll" -exec chmod +x {} ';'
+find arduino -name "*.exe" -exec chmod +x {} ';'
+find arduino -name "*.html" -exec chmod +x {} ';'
 
-# clean out the cvs entries
-find processing -name "CVS" -exec rm -rf {} ';' 2> /dev/null
-find processing -name ".cvsignore" -exec rm -rf {} ';'
+# clean out the svn entries
+find arduino -name ".svn" -exec rm -rf {} ';' 2> /dev/null
 
 # zip it all up for release
 echo Packaging standard release...
 echo
-P5=processing-$REVISION
-mv processing $P5
+P5=arduino-$REVISION
+mv arduino $P5
 zip -rq $P5.zip $P5
 # nah, keep the new directory around
 #rm -rf $P5

build/windows/dist/run.bat

@@ -6,7 +6,7 @@ REM --- (which means 128 megabytes) to something higher.
 set SAVEDCP=%CLASSPATH%
 set SAVEDPATH=%PATH%
 
-set CLASSPATH=java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\core.jar;lib\antlr.jar;lib\oro.jar;lib\registry.jar;lib\mrj.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip
+set CLASSPATH=java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\core.jar;lib\antlr.jar;lib\oro.jar;lib\registry.jar;lib\mrj.jar
 set PATH=java\bin;%PATH%
 
 start javaw -ms128m -mx128m processing.app.Base

build/windows/launcher/Makefile

@@ -1,9 +1,9 @@
 CXXFLAGS = -mwindows -mno-cygwin -O2 -Wall
 OBJS = launcher.o launcher-rc.o
 
-processing.exe: $(OBJS)
+arduino.exe: $(OBJS)
 	$(LINK.cc) $(CXXFLAGS) -o $@ $(OBJS)
-	cp processing.exe ../work/
+	cp arduino.exe ../work/
 
 $(OBJS): Makefile
 
@@ -11,4 +11,4 @@ launcher-rc.o: launcher.rc
 	windres -i $< -o $@
 
 clean:
-	$(RM) $(OBJS) processing.exe
+	$(RM) $(OBJS) arduino.exe

build/windows/make.sh

@@ -12,6 +12,8 @@ else
   cp -r ../shared work
   rm -rf work/CVS
   rm -f work/.DS_Store 
+  cp ../../lib/*.dll work
+  cp dist/lib/*.dll work
   
   # needs to make the dir because of packaging goofiness
   mkdir -p work/classes/arduino/app/preproc
@@ -80,7 +82,7 @@ else
   # take care of the examples
   mkdir work/examples
   cd work/examples
-  cp ../shared/dist/examples.zip .
+  cp ../../../shared/dist/examples.zip .
   echo Extracting examples ...
   unzip -q  -d . examples.zip
   rm -f examples.zip
@@ -112,12 +114,14 @@ 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
-
+    -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool StdCParser.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
+    -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool -glib StdCParser.g WParser.g
+../../build/windows/work/java/bin/java \
+    -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool WTreeParser.g
+../../build/windows/work/java/bin/java \
+    -cp "..\\..\\build\\windows\\work\\lib\\antlr.jar" antlr.Tool -glib WTreeParser.g WEmitter.g
 
 # back to base arduino dir
 cd ../..
@@ -127,8 +131,8 @@ fi
 ### -- BUILD BOOTLOADER -----------------------------------------
 
 cd bootloader
-export AVRDIR=../build/windows/work/tools/avr
-make
+export DIRAVR=../build/windows/work/tools/avr
+make 
 cp ATmegaBOOT.hex ../build/windows/work/bootloader
 cd ..
 
@@ -136,13 +140,14 @@ cd ..
 
 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"
+CLASSPATH="..\\build\\windows\\work\\lib\\RXTXcomm.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
+# need to do this twice because otherwise dependencies aren't resolved right.
+../build/windows/work/jikes -target 1.3 +D -classpath "$CLASSPATH;..\\build\\windows\\work\\classes" -d ..\\build\\windows\\work\\classes preproc/*.java syntax/*.java tools/*.java *.java
+../build/windows/work/jikes -target 1.3 +D -classpath "$CLASSPATH;..\\build\\windows\\work\\classes" -d ..\\build\\windows\\work\\classes preproc/*.java syntax/*.java tools/*.java *.java
 
 cd ../build/windows/work/classes
 rm -f ../lib/pde.jar
@@ -152,27 +157,6 @@ zip -0rq ../lib/pde.jar .
 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
-
 
 echo
 echo Done.