Commit graph

754 commits

Author SHA1 Message Date
Sudar
d1b6fe3cdf Formatting and typo fixes 2013-05-31 17:43:00 +05:30
Sudar
47b2dca1ef Add USB_VID and USB_PID to CPPFLAGS only if the board is Leonardo. Fixes #43 and fixes #51 2013-05-31 17:10:49 +05:30
Sudar
cd210f96ca Added a todo comment for package authors. Fixes #50 2013-05-31 16:57:25 +05:30
Sudar
dc3ec57330 Added information about the changes that went in v0.10.4 2013-05-31 09:42:44 +05:30
Sudar
d8bac0fb14 Moved all version information and change log into HISTORY.md file 2013-05-31 09:29:36 +05:30
Matthijs Kooijman
4ea3ab7884 Enable dependency tracking for libraries and core
This makes sure a library or core file gets rebuild when a header file
it depends on is changed, preventing weird surprises when the
application is recompiled with the new header values but the library
isn't.

For most users, this won't be strictly needed, but anyone working on a
library or even the Arduino core, this is must to prevent surprises or
needing a make clean between every build attempt.
2013-05-30 21:22:54 +02:00
Matthijs Kooijman
b96e03dde1 Fix creating of $(OBJDIR) in a proper way
This adds a dependency on $(OBJDIR) for every rule that creates a file
inside $(OBJDIR) but does not already depend on any file within
$(OBJDIR). All other dependencies on $(OBJDIR) are removed.

These dependencies are added after a | to tell make that this is a
"order-only prerequisite". This means that the file inside $(OBJDIR)
needs $(OBJDIR) to be present but if $(OBJDIR) changes (which happens
whenever a file _inside_ the directory is touched!), there is no need to
recompile the file within $(OBJDIR).

Implementing this using a generic implicit rule like:

$(OBJDIR)/%: | $(OBJDIR)

doesn't work, since make doesn't merge the prerequisites of multiple
implicit rules like it does for explicit rules. We could use
$(LOCAL_OBJS) and friends to create explicit rules to do something like
the above, but just adding the dependencies on all rules seems more
explicit and future-proof.
2013-05-30 21:22:52 +02:00
Paul Brook
4fdd1765e6 Rewrite dependency code
Commit originally by: Paul Brook <paul@codesourcery.com>
Port to newer version and commit message by: Matthijs Kooijman <matthijs@stdin.nl>

Instead of generating a big list of dependencies at the start, now
dependency files are generated whenever a .o file is compiled. This
works, since if the .o file does not exist, it should be compiled and
make does not need to know about its dependencies. If the .o (and thus
the .d) file does exist, the .d file contains all the dependencies used
to compile the .o file. If none of those changed, the .o file does not
need a recompile, but also the .d file is still accurate (in particular,
the dependency list cannot change without one of the dependent .h files
or the .cpp file itself changing).

This helps to remove a lot of duplication in the code, since now only a
single commandline is needed for both compilation and dependency
generation. It will probably also run a bit faster now.

Note that this commit breaks the creation of $(OBJDIR) since this
"accidentally" always worked before because $(DEPFILE) was created
before anything else. That will be fixed next.
2013-05-30 21:21:54 +02:00
Matthijs Kooijman
1f043bb819 Compile .ino and .pde files directly
Before, they were copied to a .cpp file to add the Arduino.h/WProgram.h
include. However, this would cause the compiler error messages to not refer to
the right filename, making it hard to use the compiler output in an editor like
vim to point out errors.

By using gcc's -include option, there is no need to modify the ino/pde
file before compiling. However, we will need to explicitely tell gcc
that the source file is c++, because of the non-standard extensions.
2013-05-30 19:27:11 +02:00
Matthijs Kooijman
97fa5ae161 Let the Makefile decide which include to use for .pde files
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-30 19:27:11 +02:00
Matthijs Kooijman
1329730dfe Don't try to read version.txt when it does not exist
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-30 19:27:11 +02:00
Matthijs Kooijman
ae10f71dd4 Output configuration info only once
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-30 19:27:11 +02:00
Matthijs Kooijman
5ea2437311 Fix raw_upload and reset for normal uploads
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-30 19:27:10 +02:00
Matthijs Kooijman
c64f38ae6d Check that there is exactly one .pde or .ino file
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-30 13:14:20 +02:00
Matthijs Kooijman
e1bed90404 Let MONITOR_BAUDRATE detection also look in .pde files
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-30 13:09:15 +02:00
Matthijs Kooijman
05ce9fd14b When detecting MONITOR_BAUDRATE, use $(LOCAL_INO_SRCS)
Now that this detection code is moved down a bit, it can use the same
.ino list as all the other code.
2013-05-30 13:08:02 +02:00
Matthijs Kooijman
14fd6e7126 Move MONITOR_BAUDRATE detection further down
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-30 12:55:10 +02:00
Sudar
cb5ce2c9af Updated readme to add information about change in maintainers 2013-05-19 16:33:59 +05:30
Sudar
fdf6a75d8b Merge pull request #38 from sudar/master
Merge all changes from Sudar's fork into upstream
2013-05-18 21:34:52 -07:00
Sudar
6e08e2356e Merge pull request #12 from jeffkowalski/master
removed unnecessary .DS_Store from examples/BlinkWithoutDelay/
2013-03-18 18:27:49 -07:00
Jeff Kowalski
5634d8ba51 removed unnecessary .DS_Store 2013-03-16 00:19:56 -07:00
Daniel Esteban Nombela
79243b8397 Added ifndef ARDUINO_VAR_PATH for compiling for the attiny 2013-02-10 15:13:44 +01:00
gabriel
3d4ec88dfd Allow adding extra common dependencies 2013-01-31 22:14:07 +01:00
gabriel
ccd17539e2 Merge branch 'master' of https://github.com/sudar/Arduino-Makefile 2013-01-24 12:10:27 +01:00
Sudar
cd36eb6abb Updated Readme 2013-01-21 21:17:39 +05:30
Sudar
0deef0dd4c Merge branch 'master' of git://github.com/fr0sty1/Arduino-Makefile 2013-01-21 21:15:57 +05:30
fr0sty1
c8253f60ce Update README.md 2013-01-21 00:01:09 -06:00
Sudar
e9f5897d19 Fixed the automatic baudrate detection script that was broken if the line already had the tab character 2013-01-03 22:31:24 +05:30
Sudar
0966e8e5f3 Auto detect sketchbook location even in MAC 2012-12-23 15:42:30 +05:30
Sudar
5045345467 Merge pull request #10 from gaftech/master
EEPROM upload support
2012-12-17 04:45:56 -08:00
gabriel
142098be08 Merge branch 'master' of https://github.com/sudar/Arduino-Makefile 2012-12-17 13:33:33 +01:00
Sudar
ec7f239bce Check if ARDUINO_DIR Env variable is defined or not 2012-12-17 17:12:12 +05:30
gabriel
e3b86053eb merge changes from https://github.com/sudar 2012-12-16 17:06:23 +01:00
Sudar
4446705995 Merged changes from https://github.com/alohr 2012-12-15 19:54:02 +05:30
Sudar
ee59c7ca26 Merge branch 'master' of git://github.com/ASzc/Arduino-Makefile 2012-12-15 19:46:51 +05:30
Sudar
e3844dfc60 Merge branch 'shebang' of git://github.com/anm/Arduino-Makefile 2012-12-15 19:41:59 +05:30
Sudar
addd140302 Enabled warnings 2012-12-15 19:35:58 +05:30
Adam Dunlap
9ebae306d0 Show original line number for error messages 2012-12-15 19:31:37 +05:30
Sudar
3afe25ba5a Added verify_size action 2012-12-15 18:57:08 +05:30
Sudar
2ffdb5b480 Merged all changes from rpavlik 2012-12-15 18:00:52 +05:30
Sudar
b55f3d99a1 updated readme 2012-12-15 17:34:48 +05:30
Sudar
c039f5f39b Merged all commits from upstream 2012-12-15 17:29:59 +05:30
Sudar
ac01a2609b Merged all commits from upstream 2012-12-15 17:07:00 +05:30
gabriel
86165af726 make build dir (OBJDIR) changeable 2012-12-14 23:10:03 +01:00
gabriel
168292425f add eeprom upload support 2012-11-17 22:18:56 +01:00
Fabio Pugliese Ornellas
bfd9dac216 Added dummy file to verify_size to avoid always being run. 2012-11-12 22:13:03 -02:00
Fabio Pugliese Ornellas
b5448a64dc Added sketch size verification. 2012-11-12 21:34:51 -02:00
Sudar
bb172d1c42 Merge pull request #8 from jgosmann/master
Fixing hanging uploads
2012-11-10 21:41:49 -08:00
gabriel
1e078625cb removing -w from CPPFLAGS (warnings can be usefull) 2012-11-06 14:33:10 +01:00
Jan Gosmann
90e3c9ad0b Fix upload in case of parallelized make. 2012-11-02 12:51:53 +01:00