From c08248d6507b7f35da2a589f93741ff804ede8e0 Mon Sep 17 00:00:00 2001 From: Archana Date: Sun, 19 Dec 2021 09:28:39 +0530 Subject: [PATCH] Rename the template file from .conf to .jinja Signed-off-by: Archana --- docs/proposed/psa-driver-wrappers-codegen-migration-guide.md | 2 +- library/CMakeLists.txt | 2 +- library/Makefile | 2 +- ...river_wrappers.conf => psa_crypto_driver_wrappers.c.jinja} | 0 scripts/generate_driver_wrappers.py | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename scripts/data_files/driver_templates/{psa_crypto_driver_wrappers.conf => psa_crypto_driver_wrappers.c.jinja} (100%) diff --git a/docs/proposed/psa-driver-wrappers-codegen-migration-guide.md b/docs/proposed/psa-driver-wrappers-codegen-migration-guide.md index 2e3585ffa3a5..6933aa4332a8 100644 --- a/docs/proposed/psa-driver-wrappers-codegen-migration-guide.md +++ b/docs/proposed/psa-driver-wrappers-codegen-migration-guide.md @@ -28,5 +28,5 @@ While that is the larger goal, for version 1.0 here's what's changed #### What's changed (1) psa_crypto_driver_wrappers.c will from this point on be auto generated. -(2) The auto generation is based on the template file at scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf. +(2) The auto generation is based on the template file at scripts/data_files/driver_templates/psa_crypto_driver_wrappers.c.jinja. (3) So while all driver wrapper templating support is yet to come in, the library user will need to patch into the template file as needed. diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index d7407c3c95da..3e8190acd2b7 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -168,7 +168,7 @@ if(GEN_FILES) ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/generate_driver_wrappers.py - ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf + ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/data_files/driver_templates/psa_crypto_driver_wrappers.c.jinja ) diff --git a/library/Makefile b/library/Makefile index de747acaef6d..34ed8ffcb69b 100644 --- a/library/Makefile +++ b/library/Makefile @@ -320,7 +320,7 @@ version_features.c: $(PERL) ../scripts/generate_features.pl psa_crypto_driver_wrappers.c: ../scripts/generate_driver_wrappers.py -psa_crypto_driver_wrappers.c: ../scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf +psa_crypto_driver_wrappers.c: ../scripts/data_files/driver_templates/psa_crypto_driver_wrappers.c.jinja psa_crypto_driver_wrappers.c: echo " Gen $@" $(PYTHON) ../scripts/generate_driver_wrappers.py --mbedtls-root .. . diff --git a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.c.jinja similarity index 100% rename from scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf rename to scripts/data_files/driver_templates/psa_crypto_driver_wrappers.c.jinja diff --git a/scripts/generate_driver_wrappers.py b/scripts/generate_driver_wrappers.py index 3c59a5ba9dc2..c6e2800926dd 100755 --- a/scripts/generate_driver_wrappers.py +++ b/scripts/generate_driver_wrappers.py @@ -42,8 +42,8 @@ def generate_driver_wrapper_file(mbedtls_root: str, output_dir: str) -> None: Generate the file psa_crypto_driver_wrapper.c. """ driver_wrapper_template_filename = \ - os.path.join(mbedtls_root, - "scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf") + os.path.join(mbedtls_root, \ + "scripts/data_files/driver_templates/psa_crypto_driver_wrappers.c.jinja") result = render(driver_wrapper_template_filename)