From fb4824b496683afd587d963b8240cc5c33e2f566 Mon Sep 17 00:00:00 2001 From: Harry Ramsey Date: Mon, 4 Nov 2024 16:41:22 +0000 Subject: [PATCH] Fix incorrect paths to generate_psa_constants.py This commit fixes incorrect paths to generate_psa_constants.py after being moves to tf-psa-crypto. Signed-off-by: Harry Ramsey --- programs/Makefile | 2 +- scripts/make_generated_files.bat | 2 +- tf-psa-crypto/scripts/framework_scripts_path.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/Makefile b/programs/Makefile index 3319d714c8..7665929f8d 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -141,7 +141,7 @@ psa/psa_constant_names_generated.c: $(gen_file_dep) ../tf-psa-crypto/include/psa psa/psa_constant_names_generated.c: $(gen_file_dep) ../tf-psa-crypto/tests/suites/test_suite_psa_crypto_metadata.data psa/psa_constant_names_generated.c: echo " Gen $@" - cd ../tf-psa-crypto; $(PYTHON) ../scripts/generate_psa_constants.py + cd ../tf-psa-crypto; $(PYTHON) ./scripts/generate_psa_constants.py test/query_config.c: $(gen_file_dep) ../scripts/generate_query_config.pl ## The generated file only depends on the options that are present in mbedtls_config.h, diff --git a/scripts/make_generated_files.bat b/scripts/make_generated_files.bat index 4612cc2d25..4a9c7f4004 100644 --- a/scripts/make_generated_files.bat +++ b/scripts/make_generated_files.bat @@ -19,7 +19,7 @@ python framework\scripts\generate_ssl_debug_helpers.py || exit /b 1 perl scripts\generate_visualc_files.pl || exit /b 1 @rem @@@@ programs\** @@@@ -python scripts\generate_psa_constants.py || exit /b 1 +python tf-psa-crypto\scripts\generate_psa_constants.py || exit /b 1 @rem @@@@ tests\** @@@@ python framework\scripts\generate_bignum_tests.py --directory tf-psa-crypto\tests\suites || exit /b 1 diff --git a/tf-psa-crypto/scripts/framework_scripts_path.py b/tf-psa-crypto/scripts/framework_scripts_path.py index 4d4a440c23..fd39ce3e9a 100644 --- a/tf-psa-crypto/scripts/framework_scripts_path.py +++ b/tf-psa-crypto/scripts/framework_scripts_path.py @@ -13,5 +13,6 @@ import os import sys sys.path.append(os.path.join(os.path.dirname(__file__), + os.path.pardir, os.path.pardir, 'framework', 'scripts'))