PSOC6: enable export to CMake #9756
Conversation
The approach for the hex_files subset selection is identical to makefile exporter: #9466 Single hex file should be passed to srec_cat when hex_filename is set in targets.json or mbed_app.json.
|
@vmedcy, thank you for your changes. |
tools/export/cmake/__init__.py
Outdated
| hex_files = self.resources.hex_files | ||
| if hasattr(self.toolchain.target, 'hex_filename'): | ||
| hex_filename = self.toolchain.target.hex_filename | ||
| hex_files = list(f for f in hex_files if basename(f) == hex_filename) |
There was a problem hiding this comment.
This is the same thing:
| hex_files = list(f for f in hex_files if basename(f) == hex_filename) | |
| hex_files = [f for f in hex_files if basename(f) == hex_filename] |
There was a problem hiding this comment.
Thanks for suggestion, will use the syntax next time I touch the exporter code.
For now I'd like to keep the code in cmake and makefile exporters in sync.
There was a problem hiding this comment.
Should it be a function on the base exporter class then? That way there's no need to keep them in sync.
There was a problem hiding this comment.
I can add new property to the base Exporter class, similar to existing libraries property, and update cmake and makefile exporters to use it. Please confirm this is correct:
@property
def hex_files(self):
hex_files = self.resources.hex_files
if hasattr(self.toolchain.target, 'hex_filename'):
hex_filename = self.toolchain.target.hex_filename
hex_files = [f for f in hex_files if basename(f) == hex_filename]
return hex_filesIf so, I will update this PR with the proposed change and update both exporters to use it.
There was a problem hiding this comment.
I pushed cf0ea92 and tested it has no functional impact (verified mbed export -m CY8CKIT_062_BLE -i cmake_gcc_arm and mbed export -m CY8CKIT_062_BLE -i eclipse_gcc_arm).
I also used [] to initalize the python list.
Please review. I updated the PR description to mention this is [X] Refactor
CMake and makefile exporters share a common logic for hex file selection. Factor it as a common property in the base class to avoid code duplication.
|
CI started |
Test run: SUCCESSSummary: 12 of 12 test jobs passed |
Description
CMake exporter needs to select a single hex file with CM0+ prebuilt image from resources.
The approach for the hex_files subset selection is identical to makefile exporter: #9466
Single hex file should be passed to srec_cat when "hex_filename" is set in targets.json or mbed_app.json.
There is no impact on non-PSoC6 targets (without "hex_filename" attribute in targets.json).
Pull request type
Reviewers
@theotherjimmy
Release Notes