Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed parsing of dependency files (.d) to improve sketch build speed #2395

Merged
merged 1 commit into from
Oct 31, 2014

Conversation

cmaglie
Copy link
Member

@cmaglie cmaglie commented Oct 31, 2014

Tested on Windows, this should fix issue #2255.
To be tested on Linux and Mac.

/cc @matthijskooijman

@cmaglie cmaglie self-assigned this Oct 31, 2014
@cmaglie cmaglie added this to the Release 1.5.9 milestone Oct 31, 2014
@cmaglie cmaglie added Component: IDE The Arduino IDE Type: Regression Something that used to work and now doesn't Version: 1.5.x Waiting for feedback More information must be provided before we can proceed labels Oct 31, 2014
@matthijskooijman
Copy link
Collaborator

Looks good to me. Just tested on Linux by moving my sketch dir, aruino install dir and build dir to a complicated path, stuff is still only compiled once. It even works with a header file ending in a space (e.g. 'bar.h '). The .d file looked like this:

/home/matthijs/docs/Electronics/Arduino/Sketches/Test\ $$\ .\ %\ \#\ !\ @\ ZZZ/build/sketch_oct31b.cpp.o: \
 /home/matthijs/docs/Electronics/Arduino/Sketches/Test\ $$\ .\ %\ \#\ !\ @\ ZZZ/build/sketch_oct31b.cpp \
 /home/matthijs/docs/Electronics/Arduino/Sketches/Test\ $$\ .\ %\ \#\ !\ @\ ZZZ/libraries/baz/baz.h \
 /home/matthijs/docs/Electronics/Arduino/Sketches/Test\ $$\ .\ %\ \#\ !\ @\ ZZZ/libraries/baz/bar.h\  \
 /home/matthijs/docs/Electronics/Arduino/Arduino-1.5/buildTest\ $$\ .\ %\ \#\ !\ @\ ZZZ/linux/work/hardware/arduino/avr/cores/arduino/Arduino.h \
(more truncated)

Along with merging this PR, perhaps #2003 also makes sense? That prevents rebuilding core.a when not needed.

@cmaglie
Copy link
Member Author

cmaglie commented Oct 31, 2014

Thanks for testing this one!

Yes, I'll do a quick review and merge that too.

cmaglie added a commit that referenced this pull request Oct 31, 2014
Fixed parsing of dependency files (.d) to improve sketch build speed
@cmaglie cmaglie merged commit 841b264 into arduino:ide-1.5.x Oct 31, 2014
@cmaglie cmaglie deleted the fix-makedep-unescape branch October 31, 2014 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: IDE The Arduino IDE Type: Regression Something that used to work and now doesn't Waiting for feedback More information must be provided before we can proceed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants