From 3b77b5ae5544967d450127b5386ca024e3713068 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 7 Mar 2018 15:59:36 +0000 Subject: [PATCH] projects.py: Fix and re-enable reading dependencies in-memory Signed-off-by: Jan Lindemann --- scripts/projects.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/projects.py b/scripts/projects.py index 148c01f1..880da558 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -78,9 +78,10 @@ class Build(object): else: dep_cache[prereq_type] = {} - if False: - r = get_modules_from_project_txt(cur, 'pkg.requires.jw', + if True: + r = get_modules_from_project_txt([ cur ], 'pkg.requires.jw', prereq_type, scope = 2, add_self=False, names_only=True) + debug('prerequisites = ' + ' '.join(r)) else: # legacy from build.py projects_py="/usr/bin/python2 " + my_dir + "/projects.py --prefix " + projs_root + " " + os.getenv('PROJECTS_PY_EXTRA_ARGS', "") cmd = projects_py + " prereq " + prereq_type + " " + cur @@ -191,6 +192,7 @@ class Build(object): self.run_make(m, target, cur_project, num_projects) def run(self, args_): + global do_debug visited = {} glob_order = [] projs_root=pwd.getpwuid(os.getuid()).pw_dir + "/local/src/jw.dev/proj" @@ -208,6 +210,8 @@ class Build(object): parser.add_argument('modules', nargs='+', default='', help='Modules to be built') args=parser.parse_args(args_) + if args.debug: + do_debug = True debug("----------------------------------------- running ", ' '.join(args_)) @@ -252,7 +256,7 @@ class Build(object): print(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) def debug(*objs): - if args.debug: + if do_debug: print("DEBUG: ", *objs, file=sys.stderr) def err(*objs): @@ -814,6 +818,7 @@ global_args = [] res_cache = ResultCache() dep_cache = {} my_dir = os.path.dirname(os.path.realpath(__file__)) +do_debug = False skip = 0 for a in sys.argv[1::]: @@ -838,7 +843,9 @@ 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) +args = parser.parse_args(global_args) + +do_debug = args.debug debug("----------------------------------------- running ", ' '.join(sys.argv))