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

projects.py: Back to using pkg.required.build for ldlibflags, documented the idea

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-09-16 13:16:50 +00:00
commit c182b4f5ef
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scripts/projects.py
View file

@ -10,6 +10,11 @@ from os.path import basename
from os.path import realpath from os.path import realpath
import re import re
# meaning of pkg.required variables
# build: needs to be built and installed before this can be built
# devel: needs to be installed before this-devel can be installed, i.e. before _other_ packages can be built against this
# run: needs to be installed before this-run can be installed, i.e. before this and other packages can run with this
def re_section(name): def re_section(name):
return re.compile('[' + name + ']' return re.compile('[' + name + ']'
'.*?' '.*?'
@ -155,7 +160,7 @@ def get_libname(names):
# -L needs to contain more paths than libs linked with -l would require # -L needs to contain more paths than libs linked with -l would require
def get_ldpathflags(names): def get_ldpathflags(names):
deps = get_modules_from_project_txt(names, 'pkg.required', 'devel', deps = get_modules_from_project_txt(names, 'pkg.required', 'build',
scope = 2, add_self=True, names_only=True) scope = 2, add_self=True, names_only=True)
r = '' r = ''
for m in deps: for m in deps:
@ -166,7 +171,7 @@ def get_ldpathflags(names):
def get_ldflags(names): def get_ldflags(names):
#print(names) #print(names)
deps = get_modules_from_project_txt(names, 'pkg.required', 'devel', deps = get_modules_from_project_txt(names, 'pkg.required', 'build',
scope = 1, add_self=False, names_only=True) scope = 1, add_self=False, names_only=True)
#print(deps) #print(deps)
r = '' r = ''
@ -422,7 +427,7 @@ parser.add_argument('--prefix', '-p', nargs='?', default = expanduser("~") +
parser.add_argument('arg', nargs='*', help='Command arguments') parser.add_argument('arg', nargs='*', help='Command arguments')
args=parser.parse_args(global_args) args=parser.parse_args(global_args)
debug("running ", ' '.join(sys.argv)) debug("----------------------------------------- running ", ' '.join(sys.argv))
projs_root = args.prefix projs_root = args.prefix
if args.topdir: if args.topdir: