projects.py fix: Cflags command doesn\'t pull in dependencies recursively

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-09-22 09:43:22 +00:00
commit 2e924cd664

View file

@ -275,11 +275,11 @@ def cmd_ldflags(args_):
print(get_ldflags(args.module)) print(get_ldflags(args.module))
def cmd_cflags(args_): def cmd_cflags(args_):
parser = argparse.ArgumentParser(description='ldlibpath') parser = argparse.ArgumentParser(description='cflags')
parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('module', nargs='*', help='Modules')
args=parser.parse_args(args_) args=parser.parse_args(args_)
deps = get_modules_from_project_txt(args.module, 'pkg.required.jw', 'build', deps = get_modules_from_project_txt(args.module, 'pkg.required.jw', 'build',
scope = 1, add_self=True, names_only=True) scope = 2, add_self=True, names_only=True)
r = '' r = ''
for m in reversed(deps): for m in reversed(deps):
r = r + ' -I' + proj_dir(m) + '/include' r = r + ' -I' + proj_dir(m) + '/include'
@ -307,6 +307,8 @@ def cmd_prereq(args_):
def cmd_pkg_requires(args_): def cmd_pkg_requires(args_):
parser = argparse.ArgumentParser(description='pkg-requires') parser = argparse.ArgumentParser(description='pkg-requires')
# TODO: implement Vendor evaluation
parser.add_argument('vendor', help='Vendor', default='jw')
parser.add_argument('flavour', help='Flavour') parser.add_argument('flavour', help='Flavour')
parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('module', nargs='*', help='Modules')
args=parser.parse_args(args_) args=parser.parse_args(args_)