janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

projects.py: Ongoing code beautification

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-12 13:04:07 +00:00
commit fbf75b1220
1 changed files with 63 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

131
scripts/projects.py
View file

@ -82,10 +82,10 @@ class Projects(object):
def debug(self, *objs): def debug(self, *objs):
if self.opt_debug: if self.opt_debug:
print("DEBUG: ", *objs, file=sys.stderr) print("DEBUG: ", *objs, file = sys.stderr)
def err(self, *objs): def err(self, *objs):
print("ERR: ", *objs, file=sys.stderr) print("ERR: ", *objs, file = sys.stderr)
def proj_dir(self, name): def proj_dir(self, name):
if name == self.top_name: if name == self.top_name:
@ -131,7 +131,7 @@ class Projects(object):
if self.glob_os_cascade is not None: if self.glob_os_cascade is not None:
return self.glob_os_cascade return self.glob_os_cascade
r = [ 'os', platform.system().lower() ] r = [ 'os', platform.system().lower() ]
os = self.res_cache.run(self.get_os, []) os = self.opt_os if self.opt_os is not None else self.res_cache.run(self.get_os, [])
name = re.sub('-.*', '', os) name = re.sub('-.*', '', os)
series = os series = os
while True: while True:
@ -305,11 +305,11 @@ class Projects(object):
parser = argparse.ArgumentParser(description='pkg-' + rel_type) parser = argparse.ArgumentParser(description='pkg-' + rel_type)
# TODO: implement Vendor evaluation # TODO: implement Vendor evaluation
parser.add_argument('--subsections', '-S', nargs='?', default=None, help='Subsections to consider, comma-separated') parser.add_argument('-S', '--subsections', nargs='?', default=None, help='Subsections to consider, comma-separated')
parser.add_argument('--delimiter', '-d', nargs='?', default=', ', help='Output words delimiter') parser.add_argument('-d', '--delimiter', nargs='?', default=', ', help='Output words delimiter')
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')
parser.add_argument('--no-subpackages', '-p', action='store_true', parser.add_argument('-p', '--no-subpackages', action='store_true',
default=False, help='Cut -run and -devel from package names') default=False, help='Cut -run and -devel from package names')
parser.add_argument('--no-version', action='store_true', parser.add_argument('--no-version', action='store_true',
default=False, help='Don\'t report version information') default=False, help='Don\'t report version information')
@ -438,7 +438,7 @@ class Projects(object):
cmds = [] cmds = []
for line in f: for line in f:
self.debug("checking line ", line) self.debug("checking line ", line)
rr = re.findall('^def *cmd_([a-z0-9_]+).*', line) rr = re.findall('^ def *cmd_([a-z0-9_]+).*', line)
if len(rr): if len(rr):
cmds.append(rr[0].replace('_', '-')) cmds.append(rr[0].replace('_', '-'))
f.close() f.close()
@ -524,8 +524,8 @@ class Projects(object):
#make_cmd = "make " + target + " 2>&1" #make_cmd = "make " + target + " 2>&1"
make_cmd = [ "make", target ] make_cmd = [ "make", target ]
path = find_proj_path_cached(module) path = find_proj_path_cached(module)
delim_len=120 delim_len = 120
delim='---- [%d/%d]: running %s in %s -' % (cur_project, num_projects, make_cmd, path) delim = '---- [%d/%d]: running %s in %s -' % (cur_project, num_projects, make_cmd, path)
delim = delim + '-' * (delim_len - len(delim)) delim = delim + '-' * (delim_len - len(delim))
print(',' + delim + ' >') print(',' + delim + ' >')
@ -573,28 +573,24 @@ class Projects(object):
# -- parse command line # -- parse command line
parser = argparse.ArgumentParser(description='janware software project build tool') parser = argparse.ArgumentParser(description='janware software project build tool')
parser.add_argument('--exclude', default='', help='Space seperated ist of modules to be excluded from build') parser.add_argument('--exclude', default='', help='Space seperated ist of modules to be excluded from build')
parser.add_argument('--debug', '-d', action='store_true', parser.add_argument('-n', '--dry-run', action='store_true',
default=False, help='Output debug information to stderr')
parser.add_argument('--dry-run', '-n', action='store_true',
default=False, help='Don\'t build anything, just print what would be done.') default=False, help='Don\'t build anything, just print what would be done.')
parser.add_argument('--build-order', '-O', action='store_true', parser.add_argument('-O', '--build-order', action='store_true',
default=False, help='Don\'t build anything, just print the build order.') default=False, help='Don\'t build anything, just print the build order.')
parser.add_argument('--ignore-deps', '-I', action='store_true', parser.add_argument('-I', '--ignore-deps', action='store_true',
default=False, help='Don\'t build dependencies, i.e. build only modules specified on the command line') default=False, help='Don\'t build dependencies, i.e. build only modules specified on the command line')
parser.add_argument('target', default='all', help='Build target') parser.add_argument('target', default='all', help='Build target')
parser.add_argument('modules', nargs='+', default='', help='Modules to be built') parser.add_argument('modules', nargs='+', default='', help='Modules to be built')
args=parser.parse_args(args_) args = parser.parse_args(args_)
if args.debug:
self.opt_debug = True
self.debug("----------------------------------------- running ", ' '.join(args_)) self.debug("----------------------------------------- running ", ' '.join(args_))
modules=args.modules modules = args.modules
exclude=args.exclude.split() exclude = args.exclude.split()
target=args.target target = args.target
env_exclude=os.getenv('BUILD_EXCLUDE', '') env_exclude = os.getenv('BUILD_EXCLUDE', '')
if len(env_exclude): if len(env_exclude):
print("exluding modules from environment: " + env_exclude) print("exluding modules from environment: " + env_exclude)
exclude += " " + env_exclude exclude += " " + env_exclude
@ -636,7 +632,7 @@ class Projects(object):
def cmd_test(self, args_): def cmd_test(self, args_):
parser = argparse.ArgumentParser(description='Test') parser = argparse.ArgumentParser(description='Test')
parser.add_argument('blah', default='', help='The blah argument') parser.add_argument('blah', default='', help='The blah argument')
args=parser.parse_args(args_) args = parser.parse_args(args_)
print("blah = " + args.blah) print("blah = " + args.blah)
def cmd_os_cascade(self, args_): def cmd_os_cascade(self, args_):
@ -645,7 +641,7 @@ class Projects(object):
def cmd_ldlibpath(self, args_): def cmd_ldlibpath(self, 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 = self.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], [ 'run', 'build', 'devel' ], deps = self.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], [ 'run', 'build', 'devel' ],
scope = 2, add_self=True, names_only=True) scope = 2, add_self=True, names_only=True)
r = '' r = ''
@ -656,7 +652,7 @@ class Projects(object):
def cmd_pythonpath(self, args_): def cmd_pythonpath(self, args_):
parser = argparse.ArgumentParser(description='pythonpath') parser = argparse.ArgumentParser(description='pythonpath')
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 = self.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], [ 'run', 'build' ], deps = self.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], [ 'run', 'build' ],
scope = 2, add_self=True, names_only=True) scope = 2, add_self=True, names_only=True)
r = '' r = ''
@ -671,7 +667,7 @@ class Projects(object):
def cmd_exepath(self, args_): def cmd_exepath(self, args_):
parser = argparse.ArgumentParser(description='exepath') parser = argparse.ArgumentParser(description='exepath')
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 = self.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], [ 'run', 'build', 'devel' ], deps = self.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], [ 'run', 'build', 'devel' ],
scope = 2, add_self=True, names_only=True) scope = 2, add_self=True, names_only=True)
self.debug('deps = ', deps) self.debug('deps = ', deps)
@ -683,22 +679,22 @@ class Projects(object):
def cmd_libname(self, args_): def cmd_libname(self, args_):
parser = argparse.ArgumentParser(description='libname') parser = argparse.ArgumentParser(description='libname')
parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('module', nargs='*', help='Modules')
args=parser.parse_args(args_) args = parser.parse_args(args_)
print(self.get_libname(args.module)) print(self.get_libname(args.module))
def cmd_ldflags(self, args_): def cmd_ldflags(self, args_):
parser = argparse.ArgumentParser(description='ldflags') parser = argparse.ArgumentParser(description='ldflags')
parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('module', nargs='*', help='Modules')
parser.add_argument('--exclude', action='append', help='Exclude Modules', default=[]) parser.add_argument('--exclude', action='append', help='Exclude Modules', default=[])
parser.add_argument('--add-self', '-s', action='store_true', parser.add_argument('-s', '--add-self', action='store_true',
default=False, help='Include libflags of specified modules, too, not only their dependencies') default=False, help='Include libflags of specified modules, too, not only their dependencies')
args=parser.parse_args(args_) args = parser.parse_args(args_)
print(self.get_ldflags(args.module, args.exclude, args.add_self)) print(self.get_ldflags(args.module, args.exclude, args.add_self))
def cmd_cflags(self, args_): def cmd_cflags(self, args_):
parser = argparse.ArgumentParser(description='cflags') 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 = self.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], 'build', deps = self.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], 'build',
scope = 2, add_self=True, names_only=True) scope = 2, add_self=True, names_only=True)
r = '' r = ''
@ -709,7 +705,7 @@ class Projects(object):
def cmd_path(self, args_): def cmd_path(self, args_):
parser = argparse.ArgumentParser(description='path') parser = argparse.ArgumentParser(description='path')
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 = self.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], 'run', deps = self.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], 'run',
scope = 2, add_self=True, names_only=True) scope = 2, add_self=True, names_only=True)
r = '' r = ''
@ -770,7 +766,7 @@ class Projects(object):
def cmd_proj_dir(self, args_): def cmd_proj_dir(self, args_):
parser = argparse.ArgumentParser(description='proj-dir') parser = argparse.ArgumentParser(description='proj-dir')
parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('module', nargs='*', help='Modules')
args=parser.parse_args(args_) args = parser.parse_args(args_)
r = [] r = []
for m in args.module: for m in args.module:
r.append(self.proj_dir(m)) r.append(self.proj_dir(m))
@ -779,7 +775,7 @@ class Projects(object):
def cmd_htdocs_dir(self, args_): def cmd_htdocs_dir(self, args_):
parser = argparse.ArgumentParser(description='htdocs-dir') parser = argparse.ArgumentParser(description='htdocs-dir')
parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('module', nargs='*', help='Modules')
args=parser.parse_args(args_) args = parser.parse_args(args_)
r = [] r = []
for m in args.module: for m in args.module:
r.append(self.htdocs_dir(m)) r.append(self.htdocs_dir(m))
@ -788,7 +784,7 @@ class Projects(object):
def cmd_summary(self, args_): def cmd_summary(self, args_):
parser = argparse.ArgumentParser(description='summary') parser = argparse.ArgumentParser(description='summary')
parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('module', nargs='*', help='Modules')
args=parser.parse_args(args_) args = parser.parse_args(args_)
r = [] r = []
for m in args.module: for m in args.module:
summary = self.get_value(m, "summary", None) summary = self.get_value(m, "summary", None)
@ -844,8 +840,8 @@ class Projects(object):
def cmd_check(self, args_): def cmd_check(self, args_):
parser = argparse.ArgumentParser(description='check') parser = argparse.ArgumentParser(description='check')
parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('module', nargs='*', help='Modules')
parser.add_argument('--flavour', '-f', nargs='?', default = 'build') parser.add_argument('-f', '--flavour', nargs='?', default = 'build')
args=parser.parse_args(args_) args = parser.parse_args(args_)
graph = {} graph = {}
path = [] path = []
@ -870,53 +866,52 @@ class Projects(object):
parser.add_argument('--project', default = self.top_name, help = 'Project name') parser.add_argument('--project', default = self.top_name, help = 'Project name')
parser.add_argument('section', default = '', help = 'Config section') parser.add_argument('section', default = '', help = 'Config section')
parser.add_argument('key', default = '', help = 'Config key') parser.add_argument('key', default = '', help = 'Config key')
args=parser.parse_args(args_) args = parser.parse_args(args_)
print(self.get_value(args.project, args.section, args.key)) print(self.get_value(args.project, args.section, args.key))
# -------------------------------------------------------------------- here we go # -------------------------------------------------------------------- here we go
def run(self): def run(self):
if __name__ == "__main__":
skip = 0
for a in sys.argv[1::]:
self.global_args.append(a)
if a in [ '--prefix', '-p', '--topdir', '-t' ]:
skip = 1
continue
if skip > 0:
skip = skip -1
continue
if a[0] != '-':
break
parser = argparse.ArgumentParser(description='Project metadata evaluation') skip = 0
parser.add_argument('cmd', default='', help='Command') for a in sys.argv[1::]:
parser.add_argument('--debug', '-d', action='store_true', self.global_args.append(a)
default=False, help='Output debug information to stderr') if a in [ '-p', '--prefix', '-t', '--topdir', '-O', '--os' ]:
parser.add_argument('--topdir', '-t', nargs=1, default = [], help='Project Path') skip = 1
parser.add_argument('--prefix', '-p', nargs=1, default = [ self.projs_root ], help='Projects Path Prefix') continue
parser.add_argument('--os', '-O', nargs=1, default = [], help='Target operating system') if skip > 0:
parser.add_argument('arg', nargs='*', help='Command arguments') skip = skip -1
args = parser.parse_args(self.global_args) continue
if a[0] != '-':
break
self.opt_debug = args.debug parser = argparse.ArgumentParser(description='Project metadata evaluation')
if len(args.os): parser.add_argument('-d', '--debug', action='store_true',
self.opt_os = args.os[0] default=False, help='Output debug information to stderr')
parser.add_argument('-t', '--topdir', nargs=1, default = [], help='Project Path')
parser.add_argument('-p', '--prefix', nargs=1, default = [ self.projs_root ], help='Projects Path Prefix')
parser.add_argument('-O', '--os', nargs=1, default = [], help='Target operating system')
parser.add_argument('cmd', default='', help='Command, one of: ' + self.commands())
parser.add_argument('arg', nargs='*', help='Command arguments')
args = parser.parse_args(self.global_args)
self.debug("----------------------------------------- running ", ' '.join(sys.argv)) self.opt_debug = args.debug
if len(args.os):
self.opt_os = args.os[0]
self.projs_root = args.prefix[0] self.debug("----------------------------------------- running ", ' '.join(sys.argv))
if len(args.topdir):
self.topdir = args.topdir[0] self.projs_root = args.prefix[0]
if len(args.topdir):
self.topdir = args.topdir[0]
if self.topdir: if self.topdir:
self.top_name = self.res_cache.run(self.read_value, [self.topdir + '/make/project.conf', 'build', 'name']) self.top_name = self.res_cache.run(self.read_value, [self.topdir + '/make/project.conf', 'build', 'name'])
if not self.top_name: if not self.top_name:
self.top_name = re.sub('-[0-9.-]*$', '', basename(realpath(self.topdir))) self.top_name = re.sub('-[0-9.-]*$', '', basename(realpath(self.topdir)))
if __name__ == "__main__": cmd_name = 'cmd_' + args.cmd.replace('-', '_')
cmd_name = 'cmd_' + args.cmd.replace('-', '_') cmd = getattr(self, cmd_name)
cmd = getattr(self, cmd_name) cmd(sys.argv[(len(self.global_args) + 1)::])
cmd(sys.argv[(len(self.global_args) + 1)::])
if __name__ == "__main__": if __name__ == "__main__":
projects = Projects() projects = Projects()