janware/jw-pkg
1
Code Pull requests Activity Actions

cmds.projects.CmdCreatePkgConfig: Use tmpl_render()

Browse source 
Use tmpl_render() to render the file template. Better for centralized template definition.
The commit also applies style fixes to CmdCreatePkgConfig which anticipate broader style changes to jw-pkg in general.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-05-27 18:28:10 +02:00
commit 3b65bcabb8
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
1 changed files with 47 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/python/jw/pkg/cmds/projects/CmdCreatePkgConfig.py
View file

@ -1,15 +1,30 @@
# -*- coding: utf-8 -*- from argparse import ArgumentParser, Namespace
import textwrap from .Cmd import Cmd, Parent
from argparse import Namespace, ArgumentParser from .lib.templates import tmpl_render
from ..Cmd import Cmd
from ..CmdProjects import CmdProjects
class CmdCreatePkgConfig(Cmd): # export class CmdCreatePkgConfig(Cmd): # export
def __init__(self, parent: CmdProjects) -> None: def __init__(self, parent: Parent) -> None:
super().__init__(parent, 'create-pkg-config', help='Generate a pkg-config file for a module') super().__init__(parent,
'create-pkg-config',
help='Generate a pkg-config file for a module')
@staticmethod
def __cleanup_requires(string: str) -> str:
import re
regexes = [
(r'^ +', ''),
(r'([ \t]|$)+', ', '),
(r', $', ''),
(r', $', ''),
(r' *,* *([<>=]+) *,* *', r' \1 '),
]
for patt, replacement in regexes:
string = re.sub(patt, replacement, string)
return string
def add_arguments(self, parser: ArgumentParser) -> None: def add_arguments(self, parser: ArgumentParser) -> None:
super().add_arguments(parser) super().add_arguments(parser)
@ -21,38 +36,44 @@ class CmdCreatePkgConfig(Cmd): # export
parser.add_argument('-v', '--version', default=None) parser.add_argument('-v', '--version', default=None)
parser.add_argument('-c', '--cflags', default=None) parser.add_argument('-c', '--cflags', default=None)
parser.add_argument('-l', '--libflags', default=None) parser.add_argument('-l', '--libflags', default=None)
parser.add_argument('-r', '--requires_run', default=None) parser.add_argument('-r', '--requires-run', default=None)
parser.add_argument('-R', '--requires_build', default=None) parser.add_argument('-R', '--requires-build', default=None)
parser.add_argument('-V', '--variables', nargs='*') parser.add_argument('-V', '--variables', nargs='*')
async def _run(self, args: Namespace) -> None: async def _run(self, args: Namespace) -> None:
project_conf_var_keys = ['description', 'summary', 'requires_run', 'requires_build'] project_conf_var_keys = [
merged: dict[str, str] = {} 'description',
'summary',
'requires_run',
'requires_build',
]
merged: dict[str, str|None] = {}
for key in project_conf_var_keys: for key in project_conf_var_keys:
val = getattr(args, key) val = getattr(args, key)
if val is not None and args.project_descr_file: if val is not None and args.project_descr_file:
val = self.app.get_value(args.name, key, None) val = self.app.get_value(args.name, key, None)
merged[key] = val merged[key] = val
contents = textwrap.dedent(f"""\ contents = tmpl_render(
prefix={args.prefix} 'pkg-config',
exec_prefix={{prefix}} {
includedir={{prefix}}/include 'prefix': args.prefix,
libdir={{exec_prefix}}/lib 'name': args.name,
'description': merged['summary'],
Name: {args.name} 'version': args.version,
Description: {merged['summary']} },
Version: {args.version} )
""")
if args.cflags is not None: if args.cflags is not None:
contents += f"Cflags: {args.cflags}\n" contents += f'Cflags: {args.cflags}\n'
if args.libflags is not None: if args.libflags is not None:
contents += f"Libs: {args.libflags}\n" contents += f'Libs: {args.libflags}\n'
if merged['requires_run'] is not None: if merged['requires_run'] is not None:
contents += f"Requires: {cleanup_requires(merged['requires_run'])}" contents += f'Requires: {self.__cleanup_requires(merged["requires_run"])}'
if merged['requires_build'] is not None: if merged['requires_build'] is not None:
contents += f"Requires.private: {cleanup_requires(merged['requires_build'])}" contents += (
f'Requires.private: {self.__cleanup_requires(merged["requires_build"])}'
)
# not sure what to do with requires_devel # not sure what to do with requires_devel
print(contents) print(contents)