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

Shared Gen3 module code #1754

Merged
merged 4 commits into from Apr 29, 2019

Conversation

@monkbroc
Copy link
Member

commented Apr 22, 2019

Problem

Compiling Gen 3 Device OS would put intermediate build files outside of the build/target directory or $APPDIR/target directory (when compiling a customer application).

The source code for system-part1 and user-part modules for Gen 3 devices was in ../../../modules/shared/nRF52840/src/system-part1 and ../../../modules/shared/nRF52840/src/user-part which led to the build files being put in a relative folder modules/shared/nRF52840 instead of target/system-part1/platform-X-m.

Solution

Include source files for system-part1 and user-part modules for argon, boron, xenon that are only stubs that include the actual sources from the modules/shared/nRF52840/inc/system-part1 and modules/shared/nRF52840/inc/user-part directories.

Steps to Test

  • In Workbench, open a directory with a Particle application (say blink)
  • In Workbench, run command Particle: Launch Compiler Shell
  • In the shell, run DEVICE_OS_PATH=$HOME/device-os make -f $PARTICLE_MAKEFILE compile-all PLATFORM=xenon
  • Notice that the target directory contains blink.bin and target/obj/src contains some .o and .o.d files.
  • Notice that there is no unexpected shared directory inside the Particle application directory

References

  • [CH31009]

Completeness

  • [INTERNAL] [Gen 3] Fixes a build system issue that caused object files to be created outside build directory #1754

@monkbroc monkbroc requested a review from avtolstoy Apr 22, 2019

@avtolstoy avtolstoy added this to the 1.2.0-beta.1 milestone Apr 23, 2019

@avtolstoy avtolstoy self-assigned this Apr 23, 2019

@avtolstoy avtolstoy force-pushed the feature/shared-gen3-module-code branch from e466557 to 97c63c1 Apr 29, 2019

@technobly technobly modified the milestones: 1.2.0-beta.1, 1.1.0-rc.2 Apr 29, 2019

@technobly technobly force-pushed the feature/shared-gen3-module-code branch from 97c63c1 to 4709713 Apr 29, 2019

@technobly technobly merged commit a52383e into develop Apr 29, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@technobly technobly deleted the feature/shared-gen3-module-code branch Apr 29, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.