Skip to content

RFC > Compiler: core files in "core" subfolder, libraries in "libraries" #3303

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Jun 29, 2015
Merged

RFC > Compiler: core files in "core" subfolder, libraries in "libraries" #3303

merged 3 commits into from
Jun 29, 2015

Conversation

ffissore
Copy link
Contributor

@ffissore ffissore commented Jun 8, 2015

With this PR, temporary build folder no longer gather all object files in one folder, flat. Core object files go to "core" folder, libraries to "libraries" (note: libraries already went to a folder name after the library name; I've added an additional folder level because it seemed more tidy to me

/cc @NicoHood @matthijskooijman @PaulStoffregen @cmaglie @facchinm

@ffissore ffissore added the Component: Compilation Related to compilation of Arduino sketches label Jun 8, 2015
@ffissore ffissore self-assigned this Jun 8, 2015
@ffissore ffissore added this to the Release 1.6.5 milestone Jun 8, 2015
@ffissore
Copy link
Contributor Author

ffissore commented Jun 8, 2015

Please note this ugly line
https://github.com/arduino/Arduino/pull/3303/files#diff-9cd90eab2dcf151a63c144aff0e043b9R1149
It's needed becase SAM platform.txt hardcodes a file path: {build.path}/syscalls_sam3.c.o

@ffissore ffissore changed the title Compiler: core files in "core" subfolder, libraries in "libraries" RFC > Compiler: core files in "core" subfolder, libraries in "libraries" Jun 8, 2015
@ffissore
Copy link
Contributor Author

ffissore commented Jun 8, 2015

Please give this PR a try using your cores

@NicoHood
Copy link
Contributor

NicoHood commented Jun 8, 2015

What issue are you referring to? That the .ino file should not be names as a .cpp/.h file?

@ArduinoBot
Copy link
Contributor

ArduinoBot commented Jun 8, 2015 via email

@matthijskooijman
Copy link
Collaborator

Would it make sense to also have "sketch" folder and compiler the sketch in there? That would prevent problems when the sketch contains a subdirectory called "core" for example when fixing #3080 later.

@ffissore
Copy link
Contributor Author

ffissore commented Jun 9, 2015

👍

@ffissore ffissore modified the milestones: Release 1.6.5, Release 1.6.6 Jun 15, 2015
@ffissore
Copy link
Contributor Author

This latest build is the result of a force push: I've removed the java hardcoded replacement of that {build.path}/syscalls_sam3.c.o using platform.keys.rewrite.txt and I've put sketch sources and object files into sketch folder

@ArduinoBot
Copy link
Contributor

Build successful. Please test this code using one of the following:
http://downloads.arduino.cc/javaide/pull_requests/arduino-PR-3303-BUILD-349-linux32.tar.xz
http://downloads.arduino.cc/javaide/pull_requests/arduino-PR-3303-BUILD-349-linux64.tar.xz
http://downloads.arduino.cc/javaide/pull_requests/arduino-PR-3303-BUILD-349-windows.zip
http://downloads.arduino.cc/javaide/pull_requests/arduino-PR-3303-BUILD-349-macosx.zip

@ArduinoBot
Copy link
Contributor

Build failed.

ffissore added a commit that referenced this pull request Jun 29, 2015
@ffissore
Merge pull request #3303 from ffissore/object-files-in-subdirs
0f997dc 
RFC > Compiler: core files in "core" subfolder, libraries in "libraries"
@ffissore ffissore merged commit 0f997dc into arduino:master Jun 29, 2015
@ffissore ffissore deleted the object-files-in-subdirs branch June 29, 2015 13:34
@ffissore ffissore mentioned this pull request Jun 30, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ffissore ffissore

Labels
Component: Compilation Related to compilation of Arduino sketches
Projects
None yet
Milestone
Release 1.6.6
Development

Successfully merging this pull request may close these issues.
5 participants
@ffissore @NicoHood @ArduinoBot @matthijskooijman @jantje