From 721e0c9cb4ebf08224d0fbb62aec66ac6188bda4 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Mon, 15 Sep 2025 10:00:59 +0200 Subject: [PATCH 1/2] Prepare make_generated_files.py to the removal of generate_visualc_files.pl Signed-off-by: Ronald Cron --- scripts/make_generated_files.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/make_generated_files.py b/scripts/make_generated_files.py index 1ca0f2da7..c6c3da947 100755 --- a/scripts/make_generated_files.py +++ b/scripts/make_generated_files.py @@ -158,11 +158,6 @@ if build_tree.looks_like_mbedtls_root(".") and not build_tree.is_mbedtls_3_6(): [Path("tests/opt-testcases/handshake-generated.sh")], None, "--output" ), - GenerationScript( - Path("scripts/generate_visualc_files.pl"), - get_generation_script_files("scripts/generate_visualc_files.pl"), - "--directory", None - ), ] def get_generated_files(generation_scripts: List[GenerationScript]): @@ -241,6 +236,13 @@ def main(): if build_tree.looks_like_tf_psa_crypto_root("."): generation_scripts = TF_PSA_CRYPTO_GENERATION_SCRIPTS elif not build_tree.is_mbedtls_3_6(): + + if Path("scripts/generate_visualc_files.pl").is_file(): + MBEDTLS_GENERATION_SCRIPTS.append( + GenerationScript( + Path("scripts/generate_visualc_files.pl"), + get_generation_script_files("scripts/generate_visualc_files.pl"), + "--directory", None)) generation_scripts = MBEDTLS_GENERATION_SCRIPTS else: raise Exception("No support for Mbed TLS 3.6") From fa6b187a433656008d4846332f4fb64a022bdcd7 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 16 Sep 2025 18:16:52 +0200 Subject: [PATCH 2/2] Adjust MBEDTLS_GENERATION_SCRIPTS outside of main Signed-off-by: Ronald Cron --- scripts/make_generated_files.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/make_generated_files.py b/scripts/make_generated_files.py index c6c3da947..9eba12a88 100755 --- a/scripts/make_generated_files.py +++ b/scripts/make_generated_files.py @@ -160,6 +160,13 @@ if build_tree.looks_like_mbedtls_root(".") and not build_tree.is_mbedtls_3_6(): ), ] + if Path("scripts/generate_visualc_files.pl").is_file(): + MBEDTLS_GENERATION_SCRIPTS.append( + GenerationScript( + Path("scripts/generate_visualc_files.pl"), + get_generation_script_files("scripts/generate_visualc_files.pl"), + "--directory", None)) + def get_generated_files(generation_scripts: List[GenerationScript]): """ List the generated files in Mbed TLS or TF-PSA-Crypto. The path from root @@ -236,13 +243,6 @@ def main(): if build_tree.looks_like_tf_psa_crypto_root("."): generation_scripts = TF_PSA_CRYPTO_GENERATION_SCRIPTS elif not build_tree.is_mbedtls_3_6(): - - if Path("scripts/generate_visualc_files.pl").is_file(): - MBEDTLS_GENERATION_SCRIPTS.append( - GenerationScript( - Path("scripts/generate_visualc_files.pl"), - get_generation_script_files("scripts/generate_visualc_files.pl"), - "--directory", None)) generation_scripts = MBEDTLS_GENERATION_SCRIPTS else: raise Exception("No support for Mbed TLS 3.6")