janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-25 09:35:54 +02:00
Code Activity Actions

jw.pkg.App: Support --topdir-format

Browse source 
Add support for --topdir-format. The option supports several
different values, affecting the console output of App wherever it
knows that the output contains a reference to the projects' toplevel
directory.

  - "unaltered" will have it print the toplevel directory in the same
    format as passed to the commandline

  - "absolute" will try to resolve it to an absolute path before
    printing

  - make:XXX will return the make-varible $(XXX) instead

To implement this, the proj_dir() member function is turned into the
private member function __proj_dir(), and a new member function
find_dir() is supplied, with two additional parameters:
search_subdirs and search_absdirs, which will try to find an existing
directory relative to the toplevel directory of the given module, or
in the search_absdirs list, respectively.

Command modules in cmds.projects have been updated to use the new
function.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-01-24 13:11:57 +01:00
commit aefe983920
12 changed files with 154 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/python/jw/pkg/cmds/projects/CmdBuild.py
View file

@ -84,7 +84,7 @@ class CmdBuild(Cmd): # export
def run_make(module, target, cur_project, num_projects):
#make_cmd = "make " + target + " 2>&1"
make_cmd = [ "make", target ]
path = self.app.proj_dir(module)
path = self.app.find_dir(module, pretty=False)
delim_len = 120
delim = '---- [%d/%d]: running %s in %s -' % (cur_project, num_projects, make_cmd, path)
delim = delim + '-' * (delim_len - len(delim))

15
src/python/jw/pkg/cmds/projects/CmdCflags.py
View file

@ -16,13 +16,10 @@ class CmdCflags(Cmd): # export
def _run(self, args: Namespace) -> None:
deps = self.app.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], 'build',
scope = 2, add_self=True, names_only=True)
r = ''
out = []
for m in reversed(deps):
try:
pd = self.app.proj_dir(m)
if pd is None:
continue
r = r + ' -I' + pd + '/include'
except Exception as e:
self.app.warn(f'No include path for module "{m}", ignoring: {e}')
print(r[1:])
path = self.app.find_dir(m, ['/include'])
if path is not None:
out.append('-I' + path)
if out:
print(' '.join(out))

12
src/python/jw/pkg/cmds/projects/CmdExepath.py
View file

@ -16,11 +16,9 @@ class CmdExepath(Cmd): # export
def _run(self, args: Namespace) -> None:
deps = self.app.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], [ 'run', 'build', 'devel' ],
scope = 2, add_self=True, names_only=True)
self.app.debug('deps = ', deps)
r = ''
out = []
for m in deps:
pd = self.app.proj_dir(m)
if pd is None:
continue
r = r + ':' + pd + '/bin'
print(r[1:])
path = self.app.find_dir(m, ['/bin'])
if path is not None:
out.append(path)
print(':'.join(out))

2
src/python/jw/pkg/cmds/projects/CmdGetAuthInfo.py
View file

@ -23,7 +23,7 @@ class CmdGetAuthInfo(Cmd): # export
keys = ['username', 'password']
# --- Milk jw-pkg repo
jw_pkg_dir = self.app.proj_dir('jw-pkg')
jw_pkg_dir = self.app.find_dir('jw-pkg', pretty=False)
if not os.path.isdir(jw_pkg_dir + '/.git'):
self.app.debug(f'jw-pkg directory is not a Git repo: {jw_pkg_dir}')
return

35
src/python/jw/pkg/cmds/projects/CmdLdflags.py
View file

@ -16,5 +16,38 @@ class CmdLdflags(Cmd): # export
parser.add_argument('-s', '--add-self', action='store_true',
default=False, help='Include libflags of specified modules, too, not only their dependencies')
# -L needs to contain more paths than libs linked with -l would require
def __get_ldpathflags(self, names: list[str], exclude: list[str] = []) -> str:
deps = self.app.get_modules_from_project_txt(names, ['pkg.requires.jw'], 'build',
scope = 2, add_self=True, names_only=True)
ret = []
for m in deps:
if m in exclude:
continue
libname = self.app.get_libname([m])
if not len(libname):
continue
path = self.app.find_dir(m, ['/lib'])
if not path:
continue
ret.append('-L' + path)
if not ret:
return None
return(' '.join(ret))
def _run(self, args: Namespace) -> None:
print(self.app.get_ldflags(args.module, args.exclude, args.add_self))
deps = self.app.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], 'build',
scope = 1, add_self=args.add_self, names_only=True)
out = []
for m in reversed(deps):
if m in args.exclude:
continue
libname = self.app.get_libname([m])
if len(libname):
out.append('-l' + libname)
if not out:
return
ldpathflags = self.__get_ldpathflags(args.module, args.exclude)
if ldpathflags is not None:
out.insert(0, ldpathflags)
print(' '.join(out))

11
src/python/jw/pkg/cmds/projects/CmdLdlibpath.py
View file

@ -16,10 +16,9 @@ class CmdLdlibpath(Cmd): # export
def _run(self, args: Namespace) -> None:
deps = self.app.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], [ 'run', 'build', 'devel' ],
scope = 2, add_self=True, names_only=True)
r = ''
out = []
for m in deps:
pd = self.app.proj_dir(m)
if pd is None:
continue
r = r + ':' + pd + '/lib'
print(r[1:])
path = self.app.find_dir(m, ['/lib'])
if path is not None:
out.append(path)
print(':'.join(out))

11
src/python/jw/pkg/cmds/projects/CmdPath.py
View file

@ -16,10 +16,9 @@ class CmdPath(Cmd): # export
def _run(self, args: Namespace) -> None:
deps = self.app.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], 'run',
scope = 2, add_self=True, names_only=True)
r = ''
out = []
for m in deps:
pd = self.app.proj_dir(m)
if pd is None:
continue
r = r + ':' + pd + '/bin'
print(r[1:])
path = self.app.find_dir(m, '/bin')
if path is not None:
out.append(path)
print(':'.join(out))

14
src/python/jw/pkg/cmds/projects/CmdProjDir.py
View file

@ -14,14 +14,12 @@ class CmdProjDir(Cmd): # export
parser.add_argument('module', nargs='*', help='Modules')
def _run(self, args: Namespace) -> None:
r = []
out = []
for m in args.module:
try:
pd = self.app.proj_dir(m)
if pd is None:
continue
r.append(pd)
except Exception as e:
path = self.app.find_dir(m)
if path is None:
self.app.warn(f'No project directory for module "{m}: {e}')
continue
print(' '.join(r))
out.append(path)
if out:
print(' '.join(out))

16
src/python/jw/pkg/cmds/projects/CmdPythonpath.py
View file

@ -14,16 +14,12 @@ class CmdPythonpath(Cmd): # export
p.add_argument('module', help='Modules', nargs='*')
def _run(self, args: Namespace) -> None:
import os
deps = self.app.get_modules_from_project_txt(args.module, ['pkg.requires.jw'], [ 'run', 'build' ],
scope = 2, add_self=True, names_only=True)
r = ''
out = []
for m in deps:
pd = self.app.proj_dir(m)
if pd is None:
continue
for subdir in [ 'src/python', 'tools/python' ]:
cand = pd + "/" + subdir
if os.path.isdir(cand):
r = r + ':' + cand
print(r[1:])
path = self.app.find_dir(m, ['src/python', 'tools/python'])
if path is not None:
out.append(path)
if out:
print(':'.join(out))

2
src/python/jw/pkg/cmds/projects/CmdPythonpathOrig.py
View file

@ -18,7 +18,7 @@ class CmdPythonpathOrig(Cmd): # export
scope = 2, add_self=True, names_only=True)
r = ''
for m in deps:
pd = self.app.proj_dir(m)
pd = self.app.find_dir(m, pretty=False)
if pd is None:
continue
for subdir in [ 'src/python', 'tools/python' ]: