Reworked build system: makefiles replaced with in-program logic; core replaced with targets; preproc/ replaced with Wiring's; now prepend "#include "WProgram.h" instead of wiringlite.inc; new entries in preferences.txt; bundled Wiring libs.

build/macosx/make.sh

@@ -32,6 +32,9 @@ else
   cp -pR dist/Arduino.app work/
   # cvs doesn't seem to want to honor the +x bit 
   chmod +x work/Arduino.app/Contents/MacOS/JavaApplicationStub
+
+  echo Extracting examples...
+  unzip -d work/examples ../shared/dist/examples.zip
   
   # copy the avr-gcc distribution
   echo Copying tools \(this may take a minute\)...
@@ -47,16 +50,15 @@ else
   chmod +x work/jikes
 fi
 
-echo Copying shared and core files...
+echo Copying shared files...
 cp -r ../shared/* work
-cp -r ../../core work
 
-echo Extracting examples...
-unzip -d work/examples ../shared/dist/examples.zip
+echo Copying targets...
+# make sure there's no cruft in the targets folder
+rm -rf work/lib/targets
+cp -r ../../targets work/lib/
 
 echo Copying dist files...
-cp -r dist/lib work/
-cp -r dist/core work/
 cp -r dist/bootloader work/
 
 ### -- START BUILDING -------------------------------------------
@@ -85,17 +87,19 @@ cd app
 
 ### -- BUILD PARSER ---------------------------------------------
 
-#BUILD_PREPROC=true
-
-if $BUILD_PREPROC
+if test -f preproc/expandedpde.g
 then
+  echo
+else
   cd preproc
   # build classes/grammar for preprocessor
   echo Building antlr grammar code...
   # first build the default java goop
-  java -cp ../../build/macosx/work/lib/antlr.jar antlr.Tool java.g
+  java -cp ../../build/macosx/work/lib/antlr.jar antlr.Tool StdCParser.g
   # now build the pde stuff that extends the java classes
-  java -cp ../../build/macosx/work/lib/antlr.jar antlr.Tool -glib java.g pde.g
+  java -cp ../../build/macosx/work/lib/antlr.jar antlr.Tool -glib StdCParser.g WParser.g
+  java -cp ../../build/macosx/work/lib/antlr.jar antlr.Tool WTreeParser.g
+  java -cp ../../build/macosx/work/lib/antlr.jar antlr.Tool -glib WTreeParser.g WEmitter.g
   cd ..
 fi
 

build/shared/lib/preferences.txt

@@ -262,3 +262,25 @@ linestatus.bgcolor = #66665a
 linestatus.font	   = SansSerif,plain,10
 linestatus.color   = #ffffff
 linestatus.height  = 20
+
+# set the upload defaults
+upload.erase=false
+upload.verify=false
+upload.programmer=stk500
+
+# set the parallel port defaults (used if upload.programmer=dapa)
+parallel.port=0x378
+
+# set the serial port defaults
+serial.databits=8
+serial.stopbits=1
+serial.parity=N
+serial.port=COM1
+serial.download_rate=9600
+serial.debug_rate=9600
+
+# set the build defaults
+build.mcu=atmega8
+build.f_cpu=16000000L
+build.extension=c
+build.target=arduino

build/windows/make.sh

@@ -69,10 +69,13 @@ else
   unzip -q  -d work avr_tools.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
+
+  # core/ has been replaced by targets/ and we no longer use makefiles
+  #cp dist/lib/makefile.win work/Makefile
+  #mkdir work/core
+  #cp ../../../core/*.* work/core
+  #cp dist/core/makefile.win work/core/Makefile
+  cp -r ../../targets work/lib/
 
   # take care of the examples
   mkdir work/examples