From b4cfa3b9e419268e99e54f4ecb8a4f7ad007f218 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Thu, 13 May 2010 19:23:37 +0200 Subject: buildtools/wafsamba: fix build group ordering Signed-off-by: Stefan Metzmacher --- buildtools/wafsamba/samba_utils.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'buildtools/wafsamba/samba_utils.py') diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index f0360688ba..79b0ca3f5a 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -238,6 +238,7 @@ def ENFORCE_GROUP_ORDERING(bld): a target with --target''' if Options.options.compile_targets: @feature('*') + @before('exec_rule', 'apply_core', 'collect') def force_previous_groups(self): if getattr(self.bld, 'enforced_group_ordering', False) == True: return @@ -262,12 +263,14 @@ def ENFORCE_GROUP_ORDERING(bld): if stop is None: return - for g in bld.task_manager.groups: + for i in xrange(len(bld.task_manager.groups)): + g = bld.task_manager.groups[i] + bld.task_manager.current_group = i if id(g) == stop: break debug('group: Forcing group %s', group_name(g)) for t in g.tasks_gen: - if getattr(t, 'forced_groups', False) != True: + if not getattr(t, 'forced_groups', False): debug('group: Posting %s', t.name or t.target) t.forced_groups = True t.post() -- cgit