Build script changes

Author: jainvikas8

tools/build.py

@@ -44,7 +44,6 @@
 from tools.utils import argparse_dir_not_parent
 from tools.utils import NoValidToolchainException
 from tools.utils import print_end_warnings
-from tools.psa import generate_psa_sources, clean_psa_autogen
 from tools.resources import OsAndSpeResourceFilter
 
 def main():
@@ -172,9 +171,6 @@ def main():
     skipped = []
     end_warnings = []
 
-    if options.clean:
-        clean_psa_autogen()
-
     for toolchain in toolchains:
         for target_name in targets:
             target = Target.get_target(target_name)
@@ -197,12 +193,6 @@ def main():
                     profile = extract_profile(parser, options, internal_tc_name)
 
                     if options.source_dir:
-                        if target.is_PSA_target:
-                            generate_psa_sources(
-                                source_dirs=options.source_dir,
-                                ignore_paths=[options.build_dir]
-                            )
-
                         resource_filter = None
                         if target.is_PSA_secure_target:
                             resource_filter = OsAndSpeResourceFilter()

tools/make.py

@@ -55,7 +55,6 @@
 from tools.utils import print_large_string
 from tools.settings import ROOT
 from tools.targets import Target
-from tools.psa import generate_psa_sources, clean_psa_autogen
 from tools.resources import OsAndSpeResourceFilter
 
 def default_args_dict(options):
@@ -306,9 +305,6 @@ def main():
         print('\n'.join(map(str, sorted(TEST_MAP.values()))))
     else:
 
-        if options.clean:
-            clean_psa_autogen()
-
         # Target
         if options.mcu is None:
             args_error(parser, "argument -m/--mcu is required")
@@ -339,12 +335,6 @@ def main():
             args_error(parser, str(e))
 
         if options.source_dir is not None:
-            if target.is_PSA_target:
-                generate_psa_sources(
-                    source_dirs=options.source_dir,
-                    ignore_paths=[options.build_dir]
-                )
-
             resource_filter = None
             if target.is_PSA_secure_target:
                 resource_filter = OsAndSpeResourceFilter()

tools/project.py

@@ -53,7 +53,6 @@
 from tools.utils import NotSupportedException
 from tools.options import extract_profile, list_profiles, extract_mcus
 from tools.notifier.term import TerminalNotifier
-from tools.psa import generate_psa_sources, clean_psa_autogen
 from tools.resources import OsAndSpeResourceFilter
 
 """ The CLI entry point for exporting projects from the mbed tools to any of the
@@ -380,7 +379,6 @@ def main():
 
         if options.clean:
             clean(options.source_dir)
-            clean_psa_autogen()
 
         ide = resolve_exporter_alias(options.ide)
         exporter, toolchain_name = get_exporter_toolchain(ide)
@@ -391,11 +389,6 @@ def main():
 
         try:
             target = Target.get_target(mcu)
-            if target.is_PSA_target:
-                generate_psa_sources(source_dirs=options.source_dir,
-                                     ignore_paths=[]
-                )
-
             resource_filter = None
             if target.is_PSA_secure_target:
                 resource_filter = OsAndSpeResourceFilter()

tools/psa/__init__.py

@@ -56,24 +56,3 @@ def find_secure_image(notify, resources, ns_image_path,
         raise Exception("Required secure image not found.")
 
     return secure_image
-
-
-def _get_psa_autogen_dir():
-    return os.path.join(ROOT, 'PSA_AUTOGEN')
-
-
-def clean_psa_autogen():
-    psa_out_dir = _get_psa_autogen_dir()
-
-    if os.path.isdir(psa_out_dir):
-        shutil.rmtree(psa_out_dir)
-
-
-def generate_psa_sources(source_dirs, ignore_paths):
-    services, apps = manifests_discovery(root_dirs=source_dirs,
-                                         ignore_paths=ignore_paths + ['.git'])
-    assert len(services + apps), 'PSA manifest discovery failed'
-    psa_out_dir = _get_psa_autogen_dir()
-
-    generate_spm_code(services, apps, psa_out_dir)
-    return psa_out_dir

tools/test.py

@@ -43,7 +43,6 @@
 from tools.utils import print_end_warnings
 from tools.settings import ROOT
 from tools.targets import Target
-from tools.psa import generate_psa_sources, clean_psa_autogen
 from tools.resources import OsAndSpeResourceFilter, SpeOnlyResourceFilter
 
 def main():
@@ -213,9 +212,6 @@ def main():
             sys.exit(0)
         else:
 
-            if options.clean:
-                clean_psa_autogen()
-
             # Build all tests
             if not options.build_dir:
                 args_error(parser, "argument --build is required")
@@ -236,12 +232,6 @@ def main():
                 if target.is_PSA_secure_target:
                     resource_filter = OsAndSpeResourceFilter()
 
-                if target.is_PSA_target:
-                    generate_psa_sources(
-                        source_dirs=base_source_paths,
-                        ignore_paths=[options.build_dir]
-                    )
-
                 # Build sources
                 notify = TerminalNotifier(options.verbose)
                 build_library(base_source_paths, options.build_dir, mcu,