Skip to content

build api: fix release version #12982

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

Merged
merged 9 commits into from
May 18, 2020
Merged

build api: fix release version #12982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c489c21
build api: fix release version
0xc0170 May 15, 2020
caf58a7
tools/build_api: fix wording
0xc0170 May 15, 2020
6e59bdd
build: fix error syntax
0xc0170 May 16, 2020
810b026
tools build: fix toolchain tuple, should be list
0xc0170 May 18, 2020
59db9f6
tools build: return empty list for mbed2
0xc0170 May 18, 2020
5df3c91
RZ_A1XX: public set to false as its base target
0xc0170 May 18, 2020
07084a5
tools build: add profile
0xc0170 May 18, 2020
d6fbda3
targets: add rtos profile by default
0xc0170 May 18, 2020
9b4cddd
targets: enable baremetal by default
0xc0170 May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
"std"
]
},
"supported_application_profiles": [
"rtos",
"bare-metal"
],
"config": {
"console-uart": {
"help": "Target has UART console on pins STDIO_UART_TX, STDIO_UART_RX. Value is only significant if target has SERIAL device.",
Expand Down Expand Up @@ -313,7 +317,9 @@
]
},
"c_lib": "small",
"supported_application_profiles": ["bare-metal"],
"supported_application_profiles": [
"bare-metal"
],
"device_name": "LPC1114FN28/102",
"detect_code": [
"1114"
Expand Down Expand Up @@ -4745,6 +4751,7 @@
"inherits": [
"Target"
],
"public": false,
"core": "Cortex-A9",
"supported_toolchains": [
"ARM",
Expand Down Expand Up @@ -7496,4 +7503,4 @@
"version": "1",
"public": false
}
}
}
22 changes: 11 additions & 11 deletions tools/build_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ def transform_release_toolchains(target, version):
else:
return target.supported_toolchains

def get_mbed_official_release(version):
def get_mbed_official_release(version, profile=None):
""" Given a release version string, return a tuple that contains a target
and the supported toolchains for that release.
Ex. Given '2', return (('LPC1768', ('ARM', 'GCC_ARM')),
Expand All @@ -411,26 +411,26 @@ def get_mbed_official_release(version):
RELEASE_VERSIONS
"""

# we ignore version for Mbed 6 as all targets in targets.json file are being supported
# if someone passes 2, we return empty tuple, if 5, we keep the behavior the same as
# release version is deprecated and all targets are being supported that are present
# in targets.json file

if version == '2':
return tuple(tuple([]))

mbed_official_release = (
Copy link
Collaborator

Choose a reason for hiding this comment

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

I am not sure the syntax is correct here. Can you run the script with your changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was checking what CI expected and seems to be as it is here. will study CI results once we get some, if all is being tested as it should

tuple(
tuple(
[
TARGET_MAP[target].name,
tuple(transform_release_toolchains(
TARGET_MAP[target], version))
tuple(['ARM', 'GCC_ARM'])
Copy link
Contributor

Choose a reason for hiding this comment

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

just wonder why do we use hard-coded tuple here? instead of calling the function? and IAR been dropped?
We can fix the function if need?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wanted to avoid refactoring at the moment (so changes just to one function to get the functionality needed). transform_release_toolchains does not have much meaning anymore as only ARM or GCC ARM is supported, so this can be hardcoded here

]
) for target in TARGET_NAMES \
if (hasattr(TARGET_MAP[target], 'release_versions')
and version in TARGET_MAP[target].release_versions)
if not profile or profile in TARGET_MAP[target].supported_application_profiles
)
)

for target in mbed_official_release:
is_official, reason = is_official_target(target[0], version)

if not is_official:
raise InvalidReleaseTargetException(reason)

return mbed_official_release

def target_supports_toolchain(target, toolchain_name):
Expand Down