From fe72c06e406e7a4e3fbfad917dccba884cf64213 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Mon, 9 Sep 2024 10:20:17 +0200 Subject: [PATCH] Use scripts/project_name.txt Use scripts/project_name.txt to detect between Mbed TLS and TF-PSA-Crypto project. Signed-off-by: Ronald Cron --- scripts/mbedtls_framework/build_tree.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/mbedtls_framework/build_tree.py b/scripts/mbedtls_framework/build_tree.py index 702a2cd9d..47ea0fc90 100644 --- a/scripts/mbedtls_framework/build_tree.py +++ b/scripts/mbedtls_framework/build_tree.py @@ -11,13 +11,19 @@ from typing import Optional def looks_like_tf_psa_crypto_root(path: str) -> bool: """Whether the given directory looks like the root of the PSA Crypto source tree.""" - return all(os.path.isdir(os.path.join(path, subdir)) - for subdir in ['include', 'core', 'drivers', 'programs', 'tests']) + try: + with open(os.path.join(path, 'scripts', 'project_name.txt'), 'r') as f: + return f.read() == "TF-PSA-Crypto\n" + except FileNotFoundError: + return False def looks_like_mbedtls_root(path: str) -> bool: """Whether the given directory looks like the root of the Mbed TLS source tree.""" - return all(os.path.isdir(os.path.join(path, subdir)) - for subdir in ['include', 'library', 'programs', 'tests']) + try: + with open(os.path.join(path, 'scripts', 'project_name.txt'), 'r') as f: + return f.read() == "Mbed TLS\n" + except FileNotFoundError: + return False def looks_like_root(path: str) -> bool: return looks_like_tf_psa_crypto_root(path) or looks_like_mbedtls_root(path)