janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-27 15:33:55 +01:00
Code Activity

projects.py: Add command libname

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-28 09:49:34 +00:00
commit a0b54b1b13
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/projects.py
View file

@ -43,7 +43,7 @@ def get_value(name, section, key):
file.close() file.close()
return r 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 path = proj_root + conf
r = () r = ()
try: try:
@ -107,6 +107,13 @@ def get_modules_from_project_txt(names, section, key, add_self, scope,
names_only) names_only)
return r 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 # --------------------------------------------------------------------- commands
def cmd_test(args_): def cmd_test(args_):
@ -126,6 +133,12 @@ def cmd_ldlibpath(args_):
r = r + ':' + proj_dir(m) + '/lib' r = r + ':' + proj_dir(m) + '/lib'
print r[1:] 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_): 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')
@ -134,7 +147,7 @@ def cmd_ldflags(args_):
scope = 1, add_self=True, names_only=True) scope = 1, add_self=True, names_only=True)
r = '' r = ''
for m in reversed(deps): 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:] print r[1:]
def cmd_cflags(args_): def cmd_cflags(args_):