From 263820370cee91c2f0197b94b8ad29cbdec45fc0 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 10 Jun 2019 13:55:55 +0000 Subject: [PATCH] projects.py: Allow import of projects.py Signed-off-by: Jan Lindemann --- scripts/projects.py | 59 ++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/scripts/projects.py b/scripts/projects.py index cdbe4c58..a3646cf0 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -870,39 +870,44 @@ do_debug = False topdir = None top_name = None glob_os_cascade = None +do_debug = False +projs_root = expanduser("~") + '/local/src/jw.dev/proj' -skip = 0 -for a in sys.argv[1::]: - global_args.append(a) - if a in [ '--prefix', '-p', '--topdir', '-t' ]: - skip = 1 - continue - if skip > 0: - skip = skip -1 - continue - if a[0] != '-': - break +if __name__ == "__main__": + skip = 0 + for a in sys.argv[1::]: + global_args.append(a) + if a in [ '--prefix', '-p', '--topdir', '-t' ]: + skip = 1 + continue + if skip > 0: + skip = skip -1 + continue + if a[0] != '-': + break -parser = argparse.ArgumentParser(description='Project metadata evaluation') -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 = expanduser("~") + - '/local/src/jw.dev/proj', help='Projects Path Prefix') -parser.add_argument('arg', nargs='*', help='Command arguments') -args = parser.parse_args(global_args) + parser = argparse.ArgumentParser(description='Project metadata evaluation') + 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('arg', nargs='*', help='Command arguments') + args = parser.parse_args(global_args) -do_debug = args.debug + do_debug = args.debug -debug("----------------------------------------- running ", ' '.join(sys.argv)) + debug("----------------------------------------- running ", ' '.join(sys.argv)) -projs_root = args.prefix -if args.topdir: - topdir = args.topdir + projs_root = args.prefix + if args.topdir: + topdir = args.topdir + +if topdir: top_name = res_cache.run(read_value, [topdir + '/make/project.conf', 'build', 'name']) if not top_name: top_name = re.sub('-[0-9.-]*$', '', basename(realpath(topdir))) -cmd = getattr(sys.modules[__name__], 'cmd_' + args.cmd.replace('-', '_')) -cmd(sys.argv[(len(global_args) + 1)::]) +if __name__ == "__main__": + cmd = getattr(sys.modules[__name__], 'cmd_' + args.cmd.replace('-', '_')) + cmd(sys.argv[(len(global_args) + 1)::])