From 83d679ae38e3fbe22b7ae84161244cf77cbb3540 Mon Sep 17 00:00:00 2001 From: Garrett Date: Wed, 16 Jan 2019 12:09:39 -0500 Subject: [PATCH] adds --custom-targets argument anywhere extract_mcus is called --- tools/build.py | 3 +++ tools/device_management.py | 1 + tools/get_config.py | 5 +++++ tools/make.py | 8 ++++++++ tools/project.py | 9 +++++++++ tools/test.py | 4 ++++ 6 files changed, 30 insertions(+) diff --git a/tools/build.py b/tools/build.py index 40b0a52771..304aef376a 100644 --- a/tools/build.py +++ b/tools/build.py @@ -53,6 +53,9 @@ if __name__ == '__main__': parser.add_argument("--source", dest="source_dir", type=argparse_filestring_type, default=None, help="The source (input) directory", action="append") + parser.add_argument("--custom-targets", dest="custom_targets_directory", type=argparse_filestring_type, + default=None, help="Specify directory containing custom_targets.json", action="append") + parser.add_argument("--build", dest="build_dir", type=argparse_dir_not_parent(ROOT), default=None, help="The build (output) directory") diff --git a/tools/device_management.py b/tools/device_management.py index 74a6c22edc..eff2312b0a 100644 --- a/tools/device_management.py +++ b/tools/device_management.py @@ -68,6 +68,7 @@ class MbedExtendedArgs(MainArgumentParser): parser.add_argument('-m', '--mcu') parser.add_argument('-t', '--toolchain') parser.add_argument('--source', nargs='+', dest='source_dir') + parser.add_argument('--custom-targets', dest='custom_targets_directory') parser.add_argument('--build') exclusions.append('payload') super(MbedExtendedArgs, self)._addCreateArgs(parser, exclusions) diff --git a/tools/get_config.py b/tools/get_config.py index d425e5e4bb..fcd6823d6d 100644 --- a/tools/get_config.py +++ b/tools/get_config.py @@ -39,6 +39,11 @@ if __name__ == '__main__': "--source", dest="source_dir", type=argparse_filestring_type, required=True, default=[], help="The source (input) directory", action="append") + parser.add_argument( + "--custom-targets", dest="custom_targets_directory", + type=argparse_filestring_type, default=[], + help="Specify directory containing custom_targets.json", + action="append") parser.add_argument( "--prefix", dest="prefix", action="append", default=[], help="Restrict listing to parameters that have this prefix") diff --git a/tools/make.py b/tools/make.py index 606ed257f0..73c5fd7341 100644 --- a/tools/make.py +++ b/tools/make.py @@ -202,6 +202,14 @@ if __name__ == '__main__': action="append", help="The source (input) directory" ) + parser.add_argument( + "--custom-targets", + dest="custom_targets_directory", + type=argparse_filestring_type, + default=None, + action="append", + help="Specify directory containing custom_targets.json" + ) parser.add_argument( "--duration", type=int, diff --git a/tools/project.py b/tools/project.py index 86492809f6..38ed395a42 100644 --- a/tools/project.py +++ b/tools/project.py @@ -270,6 +270,15 @@ def get_args(argv): help="The source (input) directory" ) + parser.add_argument( + "--custom-targets", + action="append", + type=argparse_filestring_type, + dest="custom_targets_directory", + default=[], + help="Specify directory containing custom_targets.json" + ) + parser.add_argument( "-D", action="append", diff --git a/tools/test.py b/tools/test.py index 84bfd6bbbe..46594246b6 100644 --- a/tools/test.py +++ b/tools/test.py @@ -65,6 +65,10 @@ if __name__ == '__main__': type=argparse_filestring_type, default=None, help="The source (input) directory (for sources other than tests). Defaults to current directory.", action="append") + parser.add_argument("--custom-targets", dest="custom_targets_directory", + type=argparse_filestring_type, + default=None, help="Specify directory containing custom_targets.json", action="append") + parser.add_argument("--build", dest="build_dir", type=argparse_dir_not_parent(ROOT), default=None, help="The build (output) directory")