aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-30Let the Makefile decide which include to use for .pde filesMatthijs Kooijman
Previously, the C preprocessor would pick either Arduino.h or WProgram.h based on a define. Now, the Makefile makes the decision earlier. This prevents having to duplicate the #if line in the next commit.
2013-05-30Don't try to read version.txt when it does not existMatthijs Kooijman
This can happen for example when the arduino directory is a checkout from git instead of a released version. Before, cat would show an error which is now prevented. The version still defaults to 100 just like before.
2013-05-30Output configuration info only onceMatthijs Kooijman
Before, the configuration info would be shown again when running a recursive make call, or when make restarted after regenerating the dependencies file. Now, it only shows the info the first time. Closes: #46
2013-05-30Fix raw_upload and reset for normal uploadsMatthijs Kooijman
In commit 90e3c9ad (Fix upload in case of parallelized make), some dependencies were shuffled to (I assume) prevent the reset from happening before or at the same time as the upload when running a parallel make. However, this introduced two problems: - The upload and raw_upload became effectively the same, and both of them did a reset (even though raw_upload should do the upload without a reset). - The reset target does not depend on $(TARGET_HEX) or verify_size, so in a parallel make the reset is executed before / at the same time as the actual compilation (since the reset doesn't seem to be needed for at least the Arduino Uno, apparently avrdude handles this, this probably wasn't noticed by anyone). Because we can't force a specific ordering of dependencies in parallel make and because adding dependencies to the reset target doesn't seem appropriate (you should be able to do a "make reset" without needing to compile everything first), this commit changes the uploading to call $(MAKE) again to do the actual upload. The current approach ensures that: - raw_upload does a compile, size check and upload and upload does the same plus a reset. - A reset is not done if the compilation fails or the size check fails. - verify_size is called only once.
2013-05-30Check that there is exactly one .pde or .ino fileMatthijs Kooijman
When there are none (and no .cpp files either), the build would stall trying to cat all the .d files together (which would result in cat getting no arguments and thus waiting for input on stdin). When there are multiple .ino and/or .pde files, the build could technically work out, the Arduino IDE concatenates all .ino / .pde files together and compiles them as a single compile unit, so unless we implement that as well, it's better to just error out.
2013-05-30Let MONITOR_BAUDRATE detection also look in .pde filesMatthijs Kooijman
Before, it would only look in .ino files. If you had no .ino file but only a .pde file, this would cause the build to hang, since grep would be waiting for input on its stdin.
2013-05-30When detecting MONITOR_BAUDRATE, use $(LOCAL_INO_SRCS)Matthijs Kooijman
Now that this detection code is moved down a bit, it can use the same .ino list as all the other code.
2013-05-30Move MONITOR_BAUDRATE detection further downMatthijs Kooijman
No changes are made to the code, it is only moved. This allows it to use LOCAL_INO_SRCS and LOCAL_INO_PDE_SRCS in the next commit.
2013-05-19Updated readme to add information about change in maintainersSudar
2013-05-18Merge pull request #38 from sudar/masterSudar
Merge all changes from Sudar's fork into upstream
2013-03-18Merge pull request #12 from jeffkowalski/masterSudar
removed unnecessary .DS_Store from examples/BlinkWithoutDelay/
2013-03-16removed unnecessary .DS_StoreJeff Kowalski
2013-02-10Added ifndef ARDUINO_VAR_PATH for compiling for the attinyDaniel Esteban Nombela
2013-01-31Allow adding extra common dependenciesgabriel
2013-01-24Merge branch 'master' of https://github.com/sudar/Arduino-Makefilegabriel
2013-01-21Updated ReadmeSudar
2013-01-21Merge branch 'master' of git://github.com/fr0sty1/Arduino-MakefileSudar
2013-01-21Update README.mdfr0sty1
2013-01-03Fixed the automatic baudrate detection script that was broken if the line ↵Sudar
already had the tab character
2012-12-23Auto detect sketchbook location even in MACSudar
2012-12-17Merge pull request #10 from gaftech/masterSudar
EEPROM upload support
2012-12-17Merge branch 'master' of https://github.com/sudar/Arduino-Makefilegabriel
2012-12-17Check if ARDUINO_DIR Env variable is defined or notSudar
2012-12-16merge changes from https://github.com/sudargabriel
2012-12-15Merged changes from https://github.com/alohrSudar
2012-12-15Merge branch 'master' of git://github.com/ASzc/Arduino-MakefileSudar
2012-12-15Merge branch 'shebang' of git://github.com/anm/Arduino-MakefileSudar
2012-12-15Enabled warningsSudar
2012-12-15Show original line number for error messagesAdam Dunlap
2012-12-15Added verify_size actionSudar
2012-12-15Merged all changes from rpavlikSudar
2012-12-15updated readmeSudar
2012-12-15Merged all commits from upstreamSudar
2012-12-15Merged all commits from upstreamSudar
2012-12-14make build dir (OBJDIR) changeablegabriel
2012-11-17add eeprom upload supportgabriel
2012-11-12Added dummy file to verify_size to avoid always being run.Fabio Pugliese Ornellas
2012-11-12Added sketch size verification.Fabio Pugliese Ornellas
2012-11-10Merge pull request #8 from jgosmann/masterSudar
Fixing hanging uploads
2012-11-06removing -w from CPPFLAGS (warnings can be usefull)gabriel
2012-11-02Fix upload in case of parallelized make.Jan Gosmann
2012-11-01Make the makefile error if the arduino port is not present.Ryan Pavlik
2012-11-01Make everybody depend on the makefile, in case cflags are changed, etc.Ryan Pavlik
2012-11-01Be able to silence configuration outputRyan Pavlik
2012-11-01Fixing problem of hanging upload.Jan Gosmann
2012-10-21Changed shebang to use /usr/bin/envAlistair MacLeod
2012-10-07added MacPortsAndreas Lohr
2012-10-07use perl from /opt/localAndreas Lohr
2012-10-07set USB_VID and USB_PID only for leonardo boardsAndreas Lohr
2012-09-25Update boards_txt path in bin/ard-parse-boards to include environment ↵Alex Szczuczko
variable ARDUINO_DIR This corrects the behaviour of ard-parse-boards --boards , which would fail if the path to boards.txt on the system didn't match the value which was hardcoded.