From 2e3f0464778d08d71e536b5fd8784d70fc970ed4 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 11 Jun 2019 10:20:16 +0000 Subject: [PATCH] projects.py: Add option --os Signed-off-by: Jan Lindemann --- scripts/projects.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/scripts/projects.py b/scripts/projects.py index a3646cf0..4e932747 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -195,7 +195,7 @@ class Build(object): self.run_make(m, target, cur_project, num_projects) def run(self, args_): - global do_debug + global opt_debug visited = {} glob_order = [] projs_root=pwd.getpwuid(os.getuid()).pw_dir + "/local/src/jw.dev/proj" @@ -216,7 +216,7 @@ class Build(object): args=parser.parse_args(args_) if args.debug: - do_debug = True + opt_debug = True debug("----------------------------------------- running ", ' '.join(args_)) @@ -262,7 +262,7 @@ class Build(object): print(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) def debug(*objs): - if do_debug: + if opt_debug: print("DEBUG: ", *objs, file=sys.stderr) def err(*objs): @@ -866,11 +866,11 @@ global_args = [] res_cache = ResultCache() dep_cache = {} my_dir = os.path.dirname(os.path.realpath(__file__)) -do_debug = False +opt_debug = False +opt_os = None topdir = None top_name = None glob_os_cascade = None -do_debug = False projs_root = expanduser("~") + '/local/src/jw.dev/proj' if __name__ == "__main__": @@ -890,18 +890,21 @@ if __name__ == "__main__": parser.add_argument('cmd', default='', help='Command') parser.add_argument('--debug', '-d', action='store_true', default=False, help='Output debug information to stderr') - parser.add_argument('--topdir', '-t', nargs='?', help='Project Path') - parser.add_argument('--prefix', '-p', nargs='?', default = projs_root, help='Projects Path Prefix') + parser.add_argument('--topdir', '-t', nargs=1, default = [], help='Project Path') + parser.add_argument('--prefix', '-p', nargs=1, default = [ projs_root ], help='Projects Path Prefix') + parser.add_argument('--os', '-O', nargs=1, default = [], help='Target operating system') parser.add_argument('arg', nargs='*', help='Command arguments') args = parser.parse_args(global_args) - do_debug = args.debug + opt_debug = args.debug + if len(args.os): + opt_os = args.os[0] debug("----------------------------------------- running ", ' '.join(sys.argv)) - projs_root = args.prefix - if args.topdir: - topdir = args.topdir + projs_root = args.prefix[0] + if len(args.topdir): + topdir = args.topdir[0] if topdir: top_name = res_cache.run(read_value, [topdir + '/make/project.conf', 'build', 'name'])