Skip to content

Rename "default_lib" to "c_lib". #12278

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 2 commits into from
Jan 21, 2020
Merged

Rename "default_lib" to "c_lib". #12278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a0fdd2
Rename "default_lib" to "c_lib".
rajkan01 Jan 17, 2020
e4f4ff2
Fixing the CI build issue
rajkan01 Jan 21, 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
12 changes: 6 additions & 6 deletions TESTS/configs/baremetal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@
"mbed-trace.fea-ipv6": false
},
"K64F": {
"target.default_lib": "small"
"target.c_lib": "small"
},
"K66F": {
"target.default_lib": "small"
"target.c_lib": "small"
},
"NUCLEO_F303RE": {
"target.default_lib": "small"
"target.c_lib": "small"
},
"NUCLEO_F411RE": {
"target.default_lib": "small"
"target.c_lib": "small"
},
"NUCLEO_F429ZI": {
"target.default_lib": "small"
"target.c_lib": "small"
},
"DISCO_L475VG_IOT01A": {
"target.default_lib": "small"
"target.c_lib": "small"
}
}
}
11 changes: 4 additions & 7 deletions targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"features": [],
"detect_code": [],
"public": false,
"default_lib": "std",
"c_lib": "std",
"bootloader_supported": false,
"static_memory_defines": true,
"printf_lib": "std",
Expand Down Expand Up @@ -2441,8 +2441,7 @@
"TRNG",
"FLASH",
"WATCHDOG"
],
"default_lib": "std",
],
"release_versions": [
"2",
"5"
Expand All @@ -2465,8 +2464,7 @@
"FSL_RTOS_MBED",
"USE_EXTERNAL_RTC"
],
"default_toolchain": "ARM",
"default_lib": "std",
"default_toolchain": "ARM",
"forced_reset_timeout": 7,
"release_versions": [
"2",
Expand Down Expand Up @@ -14026,8 +14024,7 @@
"smclk_select": "HFXT",
"smclk_div": "DIV2",
"adc_auto_scan": 1
},
"default_lib": "std",
},
"release_versions": [
"2",
"5"
Expand Down
6 changes: 3 additions & 3 deletions tools/build_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,12 +335,12 @@ def is_official_target(target_name, version):
("following toolchains: %s" %
", ".join(sorted(supported_toolchains)))

elif not target.default_lib == 'std':
elif not target.c_lib == 'std':
result = False
reason = ("Target '%s' must set the " % target.name) + \
("'default_lib' to 'std' to be included in the ") + \
("'c_lib' to 'std' to be included in the ") + \
("mbed OS 5.0 official release." + linesep) + \
("Currently it is set to '%s'" % target.default_lib)
("Currently it is set to '%s'" % target.c_lib)

else:
result = False
Expand Down
2 changes: 1 addition & 1 deletion tools/targets/lint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def check_device_has(dict):
yield "%s is not allowed in device_has" % name

MCU_REQUIRED_KEYS = ["release_versions", "supported_toolchains",
"default_lib", "public", "inherits", "device_has"]
"c_lib", "public", "inherits", "device_has"]
MCU_ALLOWED_KEYS = ["device_has_add", "device_has_remove", "core",
"extra_labels", "features", "features_add",
"features_remove", "bootloader_supported", "device_name",
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/app_override_libs/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_toolchains": ["GCC_ARM"],
"supported_c_libs": {
"arm": ["std"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/compound_inheritance/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"base": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
4 changes: 2 additions & 2 deletions tools/test/config/double_define/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"first_base": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand All @@ -18,7 +18,7 @@
"second_base": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/feature_compesition/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/feature_recursive_add/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/feature_recursive_complex/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/feature_remove/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": ["BOOTLOADER"],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/lib_requires_missing_lib/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/macro_inheritance/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/override_labels_libs/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"base": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/override_labels_libs_more/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"base": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/override_labels_targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"base": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/override_precidence/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"base": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"core": "Cortex-M0",
"config": {
"par1": "v_par1_base",
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/override_undefined/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"first_base_target": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/override_undefined_libs/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"base": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/override_with_labels/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"base": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/range_limits/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/range_limits_invalid/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_toolchains": ["GCC_ARM"],
"supported_c_libs": {
"arm": ["std"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/range_limits_override_invalid/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
4 changes: 2 additions & 2 deletions tools/test/config/requires_exclude_in_include/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand All @@ -16,7 +16,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/requires_from_lib/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
4 changes: 2 additions & 2 deletions tools/test/config/requires_include_in_exclude/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand All @@ -16,7 +16,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
4 changes: 2 additions & 2 deletions tools/test/config/requires_omit_lib/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand All @@ -16,7 +16,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/simple_features/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config/simple_iheritance/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"first_base": {
"supported_toolchains": ["GCC_ARM"],
"extra_labels": [],
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
4 changes: 2 additions & 2 deletions tools/test/targets/target_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def test_modify_existing_target():
"features": [],
"detect_code": [],
"public": false,
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down Expand Up @@ -130,7 +130,7 @@ def test_modify_existing_target():
"features": [],
"detect_code": [],
"public": false,
"default_lib": "std",
"c_lib": "std",
"supported_c_libs": {
"arm": ["std"],
"gcc_arm": ["std", "small"],
Expand Down
Loading