Fix incremental builds

Author: Oren Cohen

tools/build_api.py

@@ -763,9 +763,9 @@ def build_library(src_paths, build_path, target, toolchain_name,
             toolchain.copy_files(resources.hex_files, build_path,
                                  resources=resources)
 
-        if resources.psa_manifests:
-            toolchain.copy_files(resources.psa_manifests, build_path,
-                                 resources=resources)
+        # if resources.psa_manifests:
+        #     toolchain.copy_files(resources.psa_manifests, build_path,
+        #                          resources=resources)
 
         # Compile Sources
         objects = toolchain.compile_sources(resources, resources.inc_dirs)

tools/spm/generate_partition_code.py

@@ -10,6 +10,14 @@
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 TEMPLATES_DIR = path_join(SCRIPT_DIR, 'templates')
+MANIFEST_TEMPLATES = filter(
+    lambda filename: '_NAME_' in filename,
+    glob.glob(path_join(TEMPLATES_DIR, '*.tpl'))
+)
+COMMON_TEMPLATES = filter(
+    lambda filename: '_NAME_' not in filename,
+    glob.glob(path_join(TEMPLATES_DIR, '*.tpl'))
+)
 
 
 def assert_int(num):
@@ -611,11 +619,6 @@ def generate_partitions_sources(manifest_files, extra_filters=None):
     :return: List of paths to the generated files
     """
 
-    partition_template_files = filter(
-        lambda filename: '_NAME_' in filename,
-        glob.glob(path_join(TEMPLATES_DIR, '*.tpl'))
-    )
-
     # Construct a list of all the manifests and sfids.
     manifests = []
     for manifest_file in manifest_files:
@@ -628,13 +631,13 @@ def generate_partitions_sources(manifest_files, extra_filters=None):
     generated_folders = []
     for manifest in manifests:
         manifest_output_folder = manifest.autogen_folder
-        if not manifest.is_up_to_date(partition_template_files):
+        if not manifest.is_up_to_date(MANIFEST_TEMPLATES):
             render_args = {
                 'partition': manifest,
                 'dependent_partitions': manifest.find_dependencies(manifests)
             }
             manifest_output_folder = generate_source_files(
-                manifest.templates_to_files(partition_template_files,
+                manifest.templates_to_files(MANIFEST_TEMPLATES,
                                             manifest_output_folder),
                 render_args,
                 manifest_output_folder,
@@ -656,27 +659,32 @@ def generate_spm_data(manifest_files, output_dir, extra_filters=None):
     :return: List of paths to the generated files
     """
     autogen_folder = path_join(output_dir, 'psa_autogen')
-    template_files = filter(
-        lambda filename: '_NAME_' not in filename,
-        glob.glob(path_join(TEMPLATES_DIR, '*.tpl'))
-    )
-
     templates_dict = {
         t: path_join(autogen_folder, os.path.basename(os.path.splitext(t)[0]))
-        for t in template_files
+        for t in COMMON_TEMPLATES
     }
 
-    if is_up_to_date(manifest_files, template_files, templates_dict.values()):
-        return autogen_folder
+    complete_source_list = templates_dict.values()
 
     # Construct lists of all the manifests and mmio_regions.
     region_list = []
     manifests = []
     for manifest_file in manifest_files:
-        manifest_obj = Manifest.from_json(manifest_file, skip_src=True)
+        manifest_obj = Manifest.from_json(manifest_file)
+        manifests.append(manifest_obj)
         for region in manifest_obj.mmio_regions:
             region_list.append(region)
-        manifests.append(manifest_obj)
+        complete_source_list.extend(
+            manifest_obj.templates_to_files(
+                MANIFEST_TEMPLATES,
+                manifest_obj.autogen_folder).values()
+        )
+
+    if is_up_to_date(
+            manifest_files,
+            MANIFEST_TEMPLATES + COMMON_TEMPLATES,
+            complete_source_list):
+        return autogen_folder
 
     render_args = {
         'partitions': manifests,