Add Version to SPM templates and generator

Oren Cohen · Oren Cohen · commit 6cd4f7789f5c · 2018-11-27T09:16:43.000+02:00
diff --git a/TESTS/psa/prot_internal_storage/COMPONENT_SPE/psa_setup.c b/TESTS/psa/prot_internal_storage/COMPONENT_SPE/psa_setup.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "spm_panic.h"
diff --git a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/psa_test_its_reset_partition.c b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/psa_test_its_reset_partition.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "cmsis.h"
diff --git a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/psa_test_its_reset_partition.h b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/psa_test_its_reset_partition.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_TEST_ITS_RESET_PARTITION_H
diff --git a/TESTS/psa/prot_internal_storage/its_reset/psa_test_its_reset_ifs.h b/TESTS/psa/prot_internal_storage/its_reset/psa_test_its_reset_ifs.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_TEST_ITS_RESET_PARTITION_ROT_SERVICES_H
diff --git a/TESTS/psa/spm_client/COMPONENT_SPE/psa_client_tests_part1_partition.c b/TESTS/psa/spm_client/COMPONENT_SPE/psa_client_tests_part1_partition.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "cmsis.h"
diff --git a/TESTS/psa/spm_client/COMPONENT_SPE/psa_client_tests_part1_partition.h b/TESTS/psa/spm_client/COMPONENT_SPE/psa_client_tests_part1_partition.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_CLIENT_TESTS_PART1_PARTITION_H
diff --git a/TESTS/psa/spm_client/COMPONENT_SPE/psa_setup.c b/TESTS/psa/spm_client/COMPONENT_SPE/psa_setup.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "spm_panic.h"
diff --git a/TESTS/psa/spm_client/psa_client_tests_part1_ifs.h b/TESTS/psa/spm_client/psa_client_tests_part1_ifs.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_CLIENT_TESTS_PART1_PARTITION_ROT_SERVICES_H
diff --git a/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part1_partition.c b/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part1_partition.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "cmsis.h"
diff --git a/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part1_partition.h b/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part1_partition.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_SERVER_TEST_PART1_PARTITION_H
diff --git a/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part2_partition.c b/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part2_partition.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "cmsis.h"
diff --git a/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part2_partition.h b/TESTS/psa/spm_server/COMPONENT_SPE/psa_server_test_part2_partition.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_SERVER_TEST_PART2_PARTITION_H
diff --git a/TESTS/psa/spm_server/COMPONENT_SPE/psa_setup.c b/TESTS/psa/spm_server/COMPONENT_SPE/psa_setup.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "spm_panic.h"
diff --git a/TESTS/psa/spm_server/psa_server_test_part1_ifs.h b/TESTS/psa/spm_server/psa_server_test_part1_ifs.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_SERVER_TEST_PART1_PARTITION_ROT_SERVICES_H
diff --git a/TESTS/psa/spm_server/psa_server_test_part2_ifs.h b/TESTS/psa/spm_server/psa_server_test_part2_ifs.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_SERVER_TEST_PART2_PARTITION_ROT_SERVICES_H
diff --git a/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_setup.c b/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_setup.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "spm_panic.h"
diff --git a/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_smoke_test_part1_partition.c b/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_smoke_test_part1_partition.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "cmsis.h"
diff --git a/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_smoke_test_part1_partition.h b/TESTS/psa/spm_smoke/COMPONENT_SPE/psa_smoke_test_part1_partition.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_SMOKE_TEST_PART1_PARTITION_H
diff --git a/TESTS/psa/spm_smoke/psa_smoke_test_part1_ifs.h b/TESTS/psa/spm_smoke/psa_smoke_test_part1_ifs.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_SMOKE_TEST_PART1_PARTITION_ROT_SERVICES_H
diff --git a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/psa_its_partition.c b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/psa_its_partition.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "cmsis.h"
diff --git a/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/psa_its_partition.h b/components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/psa_its_partition.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_ITS_PARTITION_H
diff --git a/components/TARGET_PSA/services/psa_prot_internal_storage/psa_its_ifs.h b/components/TARGET_PSA/services/psa_prot_internal_storage/psa_its_ifs.h
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #ifndef PSA_ITS_PARTITION_ROT_SERVICES_H
diff --git a/components/TARGET_PSA/spm/COMPONENT_SPE/psa_setup.c b/components/TARGET_PSA/spm/COMPONENT_SPE/psa_setup.c
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version 1.0
  **********************************************************************************************************************/
 
 #include "spm_panic.h"
diff --git a/tools/spm/generate_partition_code.py b/tools/spm/generate_partition_code.py
@@ -21,9 +21,9 @@
 import os
 from os.path import join as path_join
 
-from jinja2 import Environment, FileSystemLoader
+from jinja2 import Environment, FileSystemLoader, StrictUndefined
 from jsonschema import validate
-
+__version__ = '1.0'
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 TEMPLATES_DIR = path_join(SCRIPT_DIR, 'templates')
 MANIFEST_TEMPLATES = filter(
@@ -621,7 +621,8 @@ def generate_source_files(
     env = Environment(
         loader=FileSystemLoader(templates_dirs),
         lstrip_blocks=True,
-        trim_blocks=True
+        trim_blocks=True,
+        undefined=StrictUndefined
     )
     if extra_filters:
         env.filters.update(extra_filters)
@@ -666,7 +667,8 @@ def generate_partitions_sources(manifest_files, extra_filters=None):
 
         render_args = {
             'partition': manifest,
-            'dependent_partitions': manifest.find_dependencies(manifests)
+            'dependent_partitions': manifest.find_dependencies(manifests),
+            'script_ver': __version__
         }
         manifest_output_folder = generate_source_files(
             manifest.templates_to_files(MANIFEST_TEMPLATES,
@@ -721,7 +723,8 @@ def generate_psa_setup(manifest_files, output_dir, weak_setup, extra_filters=Non
         'partitions': manifests,
         'regions': region_list,
         'region_pair_list': list(itertools.combinations(region_list, 2)),
-        'weak': weak_setup
+        'weak': weak_setup,
+        'script_ver': __version__
     }
 
     return generate_source_files(
diff --git a/tools/spm/templates/COMPONENT_SPE/psa_NAME_partition.c.tpl b/tools/spm/templates/COMPONENT_SPE/psa_NAME_partition.c.tpl
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version {{script_ver}}
  **********************************************************************************************************************/
 
 #include "cmsis.h"
diff --git a/tools/spm/templates/COMPONENT_SPE/psa_NAME_partition.h.tpl b/tools/spm/templates/COMPONENT_SPE/psa_NAME_partition.h.tpl
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version {{script_ver}}
  **********************************************************************************************************************/
 
 #ifndef PSA_{{partition.name|upper}}_PARTITION_H
diff --git a/tools/spm/templates/COMPONENT_SPE/psa_setup.c.tpl b/tools/spm/templates/COMPONENT_SPE/psa_setup.c.tpl
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version {{script_ver}}
  **********************************************************************************************************************/
 
 #include "spm_panic.h"
diff --git a/tools/spm/templates/psa_NAME_ifs.h.tpl b/tools/spm/templates/psa_NAME_ifs.h.tpl
@@ -19,6 +19,8 @@
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * THIS FILE IS AN AUTO-GENERATED FILE - DO NOT MODIFY IT.
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * Template Version 1.0
+ * Generated by tools/spm/generate_partition_code.py Version {{script_ver}}
  **********************************************************************************************************************/
 
 #ifndef PSA_{{partition.name|upper}}_PARTITION_ROT_SERVICES_H
