Move manifests scanning to its own helper function

Author: Oren Cohen

tools/export/__init__.py

@@ -299,6 +299,7 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None,
     # Skip SPM sources for Mbed OS 2 builds
     # Directories scanned would not include the root of Mbed OS for legacy builds
     if 'rtos' in toolchain.config.lib_config_data:
+        # generate_partitions_sources() is called here to prevent another scan of the file tree
         psa_files_dirs = generate_partitions_sources(resources.psa_manifests)
         psa_files_dirs.append(generate_spm_data(resources.psa_manifests, export_path))
         for directory in psa_files_dirs:

tools/make.py

@@ -58,7 +58,7 @@
 from utils import argparse_many
 from utils import argparse_dir_not_parent
 from tools.toolchains import mbedToolchain, TOOLCHAIN_CLASSES, TOOLCHAIN_PATHS
-from tools.spm import generate_partitions_sources
+from tools.spm import generate_partitions_sources, scan_for_manifests
 
 if __name__ == '__main__':
     # Parse Options
@@ -246,12 +246,7 @@
                            "Currently set search path: %s"
                            %(toolchain, search_path))
 
-    manifests = set()
-    for src_dir in options.source_dir:
-        for root, dirnames, filenames in os.walk(src_dir):
-            for filename in fnmatch.filter(filenames, '*_psa.json'):
-                manifests.add(join(root, filename))
-    generate_partitions_sources(list(manifests))
+    generate_partitions_sources(scan_for_manifests(options.source_dir))
 
     # Test
     build_data_blob = {} if options.build_data else None

tools/spm/__init__.py

@@ -1,3 +1,8 @@
-from .generate_partition_code import generate_partitions_sources, generate_spm_data
+from .generate_partition_code import generate_partitions_sources, \
+    generate_spm_data, scan_for_manifests
 
-__all__ = ['generate_partitions_sources', 'generate_spm_data']
+__all__ = [
+    'generate_partitions_sources',
+    'generate_spm_data',
+    'scan_for_manifests'
+]

tools/spm/generate_partition_code.py

@@ -1,4 +1,5 @@
 #!/usr/bin/python
+import fnmatch
 import glob
 import itertools
 import json
@@ -18,6 +19,7 @@
     lambda filename: '_NAME_' not in filename,
     glob.glob(path_join(TEMPLATES_DIR, '*.tpl'))
 )
+MANIFEST_FILE_PATTERN = '*_psa.json'
 
 
 def assert_int(num):
@@ -697,3 +699,18 @@ def generate_spm_data(manifest_files, output_dir, extra_filters=None):
         autogen_folder,
         extra_filters=extra_filters
     )
+
+
+def scan_for_manifests(src_dirs):
+    """
+    Scan a list of directories for PSA manifests.
+    
+    :param src_dirs: List of directories
+    :return: List of PSA manifests
+    """
+    manifests = set()
+    for src_dir in src_dirs:
+        for root, dirnames, filenames in os.walk(src_dir, followlinks=True):
+            for filename in fnmatch.filter(filenames, MANIFEST_FILE_PATTERN):
+                manifests.add(os.path.join(root, filename))
+    return list(manifests)

tools/test.py

@@ -43,7 +43,7 @@
 from tools.utils import argparse_dir_not_parent
 from tools.toolchains import mbedToolchain, TOOLCHAIN_PATHS, TOOLCHAIN_CLASSES
 from tools.settings import CLI_COLOR_MAP
-from tools.spm import generate_partitions_sources
+from tools.spm import generate_partitions_sources, scan_for_manifests
 
 if __name__ == '__main__':
     try:
@@ -196,12 +196,7 @@
             if not base_source_paths:
                 base_source_paths = ['.']
 
-            manifests = set()
-            for src_dir in base_source_paths:
-                for root, dirnames, filenames in os.walk(src_dir):
-                    for filename in fnmatch.filter(filenames, '*_psa.json'):
-                        manifests.add(os.path.join(root, filename))
-            generate_partitions_sources(list(manifests))
+            generate_partitions_sources(scan_for_manifests(base_source_paths))
 
             build_report = {}
             build_properties = {}