Update cmsis_mcu_descr.py for custom targets (#394)

* Update cmsis_mcu_descr.py for custom targets

the fetch-missing is scanning also custom_target.json5 file if exist in project, for help not solve missing memory banks

* Update cmsis_mcu_descr.py for auto search custom_targets.json file

* Update cmsis_mcu_descr.py - rework for remove global var

* Update cmsis_mcu_descr.py - fix
pull/15531/head
JohnK1987 2024-11-25 00:17:50 +01:00 committed by GitHub
parent f3da3a1cbb
commit 0fb002c6c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 62 additions and 14 deletions

View File

@ -25,17 +25,19 @@ import datetime
import logging import logging
import json import json
import sys import sys
import re
import argparse
from typing import Set, Dict, Any from typing import Set, Dict, Any
LOGGER = logging.getLogger(__name__) LOGGER = logging.getLogger(__name__)
# Calculate path to Mbed OS JSON files # Calculate path to Mbed OS JSON files
THIS_SCRIPT_DIR = pathlib.Path(os.path.dirname(__file__)) THIS_SCRIPT_DIR = pathlib.Path(os.path.dirname(__file__))
PROJECT_ROOT = THIS_SCRIPT_DIR.parent.parent.parent.parent.parent
MBED_OS_DIR = THIS_SCRIPT_DIR.parent.parent.parent.parent MBED_OS_DIR = THIS_SCRIPT_DIR.parent.parent.parent.parent
TARGETS_JSON5_PATH = MBED_OS_DIR / "targets" / "targets.json5" TARGETS_JSON5_PATH = MBED_OS_DIR / "targets" / "targets.json5"
CMSIS_MCU_DESCRIPTIONS_JSON_PATH = MBED_OS_DIR / "targets" / "cmsis_mcu_descriptions.json5" CMSIS_MCU_DESCRIPTIONS_JSON_PATH = MBED_OS_DIR / "targets" / "cmsis_mcu_descriptions.json5"
# Top-level command # Top-level command
@click.group( @click.group(
name="cmsis-mcu-descr", name="cmsis-mcu-descr",
@ -67,14 +69,58 @@ def open_cmsis_cache(*, must_exist: bool = True) -> cmsis_pack_manager.Cache:
return cmsis_cache return cmsis_cache
def find_json_files(root_dir, exclude_dirs=[], file_pattern=r".*\.(json|json5)"):
"""
Recursively searches for files matching the specified pattern in a given directory, excluding specified directories.
Args:
root_dir (str): The root directory to search.
exclude_dirs (list): A list of directory names to exclude.
file_pattern (str): A regular expression pattern to match file names.
Returns:
A list of paths to found files.
"""
json_files = []
for root, dirs, files in os.walk(root_dir):
# Exclude specified directories
for exclude_dir in exclude_dirs:
if exclude_dir in dirs:
dirs.remove(exclude_dir)
for file in files:
if re.match(file_pattern, file):
json_files.append(pathlib.Path(os.path.join(root, file)))
return json_files
def get_mcu_names_used_by_targets_json5() -> Set[str]: def get_mcu_names_used_by_targets_json5() -> Set[str]:
""" """
Accumulate set of all `device_name` properties used by all targets defined in targets.json5 Accumulate set of all `device_name` properties used by all targets defined in targets.json5 and custom_targets.json/json5.
""" """
LOGGER.info("Scanning targets.json5 for used MCU names...")
# Search for files starting with "custom_targets" of type .json or .json5. Also exclude some folders like build and mbed-os
exclude_dirs = ["build", "mbed-os", ".git"]
file_pattern = r"custom_targets\.(json|json5)"
custom_targets_file = find_json_files(PROJECT_ROOT, exclude_dirs, file_pattern)
custom_targets_json_path = {}
for file in custom_targets_file:
if os.path.exists(file):
custom_targets_json_path = file
LOGGER.info(f"Custom_targets file detected - {custom_targets_json_path}")
used_mcu_names = set() used_mcu_names = set()
targets_json5_contents = decode_json_file(TARGETS_JSON5_PATH) LOGGER.info("Scanning targets.json5 for used MCU names...")
for target_details in targets_json5_contents.values(): json_contents = decode_json_file(TARGETS_JSON5_PATH)
if custom_targets_file:
LOGGER.info("Scanning custom_targets.json/json5. for used MCU names...")
json_contents.update(decode_json_file(custom_targets_json_path))
for target_details in json_contents.values():
if "device_name" in target_details: if "device_name" in target_details:
used_mcu_names.add(target_details["device_name"]) used_mcu_names.add(target_details["device_name"])
return used_mcu_names return used_mcu_names
@ -153,26 +199,27 @@ def check_missing():
@cmsis_mcu_descr.command( @cmsis_mcu_descr.command(
name="fetch-missing", name="fetch-missing",
short_help="Fetch any missing MCU descriptions used by targets.json5." short_help="Fetch any missing MCU descriptions used by targets.json5 or custom_targets.json/json5.."
) )
def fetch_missing(): def fetch_missing():
""" """
Scans through cmsis_mcu_descriptions.json for any missing MCU descriptions that are referenced by Scans through cmsis_mcu_descriptions.json5 for any missing MCU descriptions that are referenced by
targets.json5. If any are found, they are imported from the CMSIS cache. targets.json5 or custom_targets.json/json5. If any are found, they are imported from the CMSIS cache.
Note that downloaded descriptions should be checked for accuracy before they are committed. Note that downloaded descriptions should be checked for accuracy before they are committed.
""" """
used_mcu_names = get_mcu_names_used_by_targets_json5() used_mcu_names = get_mcu_names_used_by_targets_json5()
# Accumulate set of all keys in cmsis_mcu_descriptions.json # Accumulate set of all keys in cmsis_mcu_descriptions.json
LOGGER.info("Scanning cmsis_mcu_descriptions.json for missing MCUs...") LOGGER.info("Scanning cmsis_mcu_descriptions.json5 file for missing MCUs...")
cmsis_mcu_descriptions_json_contents: Dict[str, Any] = decode_json_file(CMSIS_MCU_DESCRIPTIONS_JSON_PATH) cmsis_mcu_descriptions_json_contents: Dict[str, Any] = decode_json_file(CMSIS_MCU_DESCRIPTIONS_JSON_PATH)
available_mcu_names = cmsis_mcu_descriptions_json_contents.keys() available_mcu_names = cmsis_mcu_descriptions_json_contents.keys()
# Are there any missing? # Are there any missing?
missing_mcu_names = used_mcu_names - available_mcu_names missing_mcu_names = used_mcu_names - available_mcu_names
if len(missing_mcu_names) == 0: if len(missing_mcu_names) == 0:
print("No missing MCUs, no work to do.") LOGGER.info("No missing MCUs, no work to do.")
return return
# Load CMSIS cache to access new MCUs # Load CMSIS cache to access new MCUs
@ -187,7 +234,8 @@ def fetch_missing():
f"to be added manually?") f"to be added manually?")
missing_mcus_dict[mcu] = cmsis_cache.index[mcu] missing_mcus_dict[mcu] = cmsis_cache.index[mcu]
print(f"Add the following entries to {CMSIS_MCU_DESCRIPTIONS_JSON_PATH}:") LOGGER.info("In case of Custom target remove 'device_name' from your custom_targets.json5 file and add\n" +
"just the 'memories' section as 'memory_banks' section from content below.\n" +
f"Otherwise add the whole following entries to {CMSIS_MCU_DESCRIPTIONS_JSON_PATH}:")
print(json.dumps(missing_mcus_dict, indent=4, sort_keys=True)) print(json.dumps(missing_mcus_dict, indent=4, sort_keys=True))
sys.exit(1) sys.exit(1)