Build extensions in mpconfigport and mpconfigboard #6629
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jepler
previously approved these changes
Jul 22, 2022
There was a problem hiding this comment.
I didn't spot any concerns. I didn't do any direct testing, though, so leaving unmerged right this second in case someone else wants to do that. Thanks for working on this! The scripts don't have to be perfected today, but it's good to take a look every now and then to see what can be better. Please feel free to ping if nobody else weighs in.
tannewt
requested changes
Jul 25, 2022
- define CIRCUITPY_BUILD_EXTENSIONS to predefined values - set CIRCUITPY_BUILD_EXTENSIONS in port and board config - reuse the support matrix "get_settings_from_makefile" to get it - move the existing port and board specific values - remove the C3 specific board values because it's not the default - update build_release_files.py to use get_settings_from_makefile
the modules_support_matrix usees a dictionnary per board instead of a list optionally include the frozen modules URLs in it
…a list from there uppercase some of the configuration lists and dicts properly split the extensions into a list
Neradoc
force-pushed
the
board-extensions-in-boards-dir
branch
from
f35dca8 to
6e5c818
Compare
|
Rebased on main. |
|
This was a network error. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move the list of extensions per board into mpconfigport.mk an mpconfigboard.mk, with
CIRCUITPY_BUILD_EXTENSIONSas a list of the exact extensions, eg:bin,uf2. Default port value is set in the port config file, by variant if necessary (like IDF_TARGET).resolves #6269 and replaces #6618
The list of extensions is retrieved along other configuration data with
get_settings_from_makefilewhich uses a call tomakein order to automatically manage defaults per port and overrides per board.It is used from 3 files:
The support matrix docs page seems properly generated.
The json generated by build_board_info matches the output from main.
The build CI on my fork reported no errors, though I only briefly checked if the generated files matched (uf2, bin, etc.).
Other notes:
I originally wanted to reorganize the python tools a little bit with this PR, by making a module in the tools directory for the common functions. However, this demands a little bit more consideration, to separate configuration data that should cause a build of all boards, versus those that don't. It can come later.
For example
ALIASES_BRAND_NAMESonly matters for the website update, whereas adding toLANGUAGE_ALLOW_LISTshould probably trigger a compile of all, baring a trick to only compile the new language.