From a0b54b1b131c25ff63b92085c901ae38eae32743 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 28 Jan 2016 09:49:34 +0000 Subject: [PATCH] projects.py: Add command libname Signed-off-by: Jan Lindemann --- scripts/projects.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/scripts/projects.py b/scripts/projects.py index 5e7d0d35..c909e96a 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -43,7 +43,7 @@ def get_value(name, section, key): file.close() return r - for conf in [ '/doc/share/project.txt', '/make/project.conf' ]: + for conf in [ '/make/project.conf', '/doc/share/project.txt' ]: path = proj_root + conf r = () try: @@ -107,6 +107,13 @@ def get_modules_from_project_txt(names, section, key, add_self, scope, names_only) return r +def get_libname(names): + vals = get_modules_from_project_txt(names, 'build', 'libname', + scope = 1, add_self=False, names_only=True) + if not vals: + return ' '.join(names) + return ' '.join(reversed(vals)) + # --------------------------------------------------------------------- commands def cmd_test(args_): @@ -126,6 +133,12 @@ def cmd_ldlibpath(args_): r = r + ':' + proj_dir(m) + '/lib' print r[1:] +def cmd_libname(args_): + parser = argparse.ArgumentParser(description='libname') + parser.add_argument('module', nargs='*', help='Modules') + args=parser.parse_args(args_) + print get_libname(args.module) + def cmd_ldflags(args_): parser = argparse.ArgumentParser(description='ldlibpath') parser.add_argument('module', nargs='*', help='Modules') @@ -134,7 +147,7 @@ def cmd_ldflags(args_): scope = 1, add_self=True, names_only=True) r = '' for m in reversed(deps): - r = r + ' -L' + proj_dir(m) + '/lib -l' + m + r = r + ' -L' + proj_dir(m) + '/lib -l' + get_libname([m]) print r[1:] def cmd_cflags(args_):