janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 22:40:38 +01:00
Code Activity

projects.py: Fix ldflags command for absent libs

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-28 12:39:08 +00:00
commit 167b01c0df
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scripts/projects.py
View file

@ -112,8 +112,22 @@ def get_libname(names):
scope = 1, add_self=False, names_only=True) scope = 1, add_self=False, names_only=True)
if not vals: if not vals:
return ' '.join(names) return ' '.join(names)
if 'none' in vals:
vals.remove('none')
return ' '.join(reversed(vals)) return ' '.join(reversed(vals))
def get_ldflags(names):
deps = get_modules_from_project_txt(names, 'pkg.required', 'build',
scope = 1, add_self=True, names_only=True)
r = ''
for m in reversed(deps):
libname = get_libname([m])
if len(libname):
r = r + ' -L' + proj_dir(m) + '/lib -l' + libname
if len(r):
return r[1::]
return ''
# --------------------------------------------------------------------- commands # --------------------------------------------------------------------- commands
def cmd_test(args_): def cmd_test(args_):
@ -143,12 +157,7 @@ def cmd_ldflags(args_):
parser = argparse.ArgumentParser(description='ldlibpath') parser = argparse.ArgumentParser(description='ldlibpath')
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', 'build', print get_ldflags(args.module)
scope = 1, add_self=True, names_only=True)
r = ''
for m in reversed(deps):
r = r + ' -L' + proj_dir(m) + '/lib -l' + get_libname([m])
print r[1:]
def cmd_cflags(args_): def cmd_cflags(args_):
parser = argparse.ArgumentParser(description='ldlibpath') parser = argparse.ArgumentParser(description='ldlibpath')