mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-28 11:25:23 +02:00
jw.pkg.App: Support --topdir-format
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:
parent
0b83c863a2
commit
aefe983920
12 changed files with 154 additions and 119 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue