Skip to content

Added ability to freeze multiple directories; freeze neopixel library in cpx build #199

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

Merged
merged 2 commits into from
Aug 23, 2017

Conversation

dhalbert
Copy link
Collaborator

Freeze neopixel library in CPX build.

In order to generalize this:

Added ability to freeze multiple directories. Modules to freeze are included as git submodules. Submodules do not need to be duplicated if they are used for multiple builds.

In addition to FROZEN_MPY_DIR, there is now a FROZEN_MPY_DIRS variable, which includes FROZEN_MPY_DIR for backwards compatibility. Modules to freeze for a particular board can be specified in mpconfigboard.mk for that board by defining FROZEN_MPY_DIRS

In the process, reworked py/mkrules.mk rules to build frozen modules in a more straightforward way.

Cleanup: fix odd $(BUILD)/$(BUILD) subdirectory structure that showed up for frozen modules.

…e directories.

Modules to freeze are included as git submodules.
@dhalbert dhalbert assigned tannewt and unassigned tannewt Aug 23, 2017
@dhalbert dhalbert requested a review from tannewt August 23, 2017 02:31
@dhalbert dhalbert self-assigned this Aug 23, 2017
.gitmodules Outdated
@@ -17,3 +17,6 @@
[submodule "tools/uf2"]
path = tools/uf2
url = https://github.com/Microsoft/uf2.git
[submodule "atmel-samd/frozen/Adafruit_CircuitPython_NeoPixel"]
path = atmel-samd/frozen/Adafruit_CircuitPython_NeoPixel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make more sense to have these in the top level? They should have an API that works across all ports.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I didn't do that initially because FROZEN_MPY_DIRS isn't implemented in all the ports. But it will be implemented in most or all of our ports eventually.

Changed and tested on a CPX.

@tannewt tannewt merged commit 74cfdeb into master Aug 23, 2017
@tannewt
Copy link
Member

tannewt commented Aug 23, 2017

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants