Commit graph

4,813 commits

Author SHA1 Message Date
d054e3c343
defs.mk: Add .toml to default config file formats

Anticipating future additions, support installing *.toml as a standard configuration file format.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-31 18:20:31 +02:00
f21ff8e713
topdir.mk: Add dynamic file creation machinery

Add generic machinery to dynamically create files in $(TOPDIR). The need arises because version controlled configuration files for linters are going to be introduced.

For that, this commit introduces a variable $(TD_GENERATE_FILES), which target all depends on, and which topdir.clean removes.

It defaults to another variable also introduced by this commit, $(TD_COPY_FILES), which in turn defaults to $(TOPDIR)/conf/topdir.

This commit also adds support for JW_PKG_TOPDIR_COPY_PATH. It supports a PATH-style syntax, which allows pointing to multiple directories to be checked for source files. If they exist, they will be appended to the files found in $(TOPDIR)/conf/topdir after copying. Defining arbitray files to copy is not supported before security implications during CI runs are better understood.

Having the copy prerequisites work comes at the cost of having to add .SECONDEXPANSION. Since it's limited to the toplevel Makefile, I suppose that's acceptable.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-31 18:20:30 +02:00
49016373e1
cmds.projects.CmdCreateFile: Add module

Add CmdCreateFile as a command to generate files from project metadata. It uses the new tmpl_render() engine, might serve as a central location to replace other code generating files, let's see how that evolves.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-31 18:20:29 +02:00
d449472ceb
cmds.projects.lib.pkg_relations: Add module

BaseCmdPkgRelations contains pkg_relations(), a function doing package graph analysis code. The function needs to be made available to code outside BaseCmdPkgRelations, so move it to cmds.projects.lib.pkg_relations.

The commit also applies style fixes to both BaseCmdPkgRelations and pkg_relations which anticipate broader style changes to jw-pkg in general.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-31 18:19:44 +02:00
3b65bcabb8
cmds.projects.CmdCreatePkgConfig: Use tmpl_render()

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>
2026-05-31 18:19:39 +02:00
7edf5a4c26
cmds.projects.lib.templates: Add module

Add tmpl_render(), a function to provide a primitive template renderer. It takes a dictionary for values to replace variables shaped {some-variable} in templates found by their name. For now, the templates are defined in the templates module instead of being read from a template directory. The values may be lists, in which case they are rendered with a delimiter, defaulting to ",".

Using an existing template engine like jinja2 is tempting but would introduce additional dependencies jw-pkg is trying hard to avoid.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-31 17:52:20 +02:00
4e15552fc2
cmds.projects.lib: Add Module

Add a sub-module for code that's too specific to jw.pkg.cmds.projects to go into jw.pkg.lib but too generic to go into a command module.

Long-term, it might be a good idea to create a place for code which jw-pkg doesn't exclusively use for its own purposes. jw.lib, for example. Then, liberated from the burden to be generally useful also externally, jw.pkg.lib might be a better fit for code currently in jw.pkg.cmds.xxx.lib, and a more natural place usable across subcommands.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-31 17:52:20 +02:00
8697695697
CmdBase / cmds.projects.Cmd: Add modules

Lots of sub- and sub-subcommands are derived from the base class of the invoking command, notably below cmds.projects. That provides some properties shared across the ancestor hierarchy of a command, but is semantically unsound. Introduce jw.pkg.BaseCmd class as a place to provide basic helpers shared across all commands used in a jw.pkg.App's context. Also add cmds.projects.Cmd to be used by other commands in cmds.projects in later commits.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-31 17:52:20 +02:00
13ec34cc57
lib.init.detect_modules(): Add function

Not all __init__.py modules are generated by python-tools.sh, some are needed early to make jw-pkg useful without generation, notably in jw.pkg.cmds.

Add detect_modules() to unify that detection, and place it into a minimal module lib.init to not increase startup time cost.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-31 17:52:20 +02:00
fc6f2fbb65
python-tools.sh: Fix __init__.py linter complaints

The __init__.py files as gnerated by python-tools.sh contain multiple issues, fix them:

- Make the machinery fail if the same type name is imported from different modules
- Support relative imports from .Module import Module instead of having to use the entire module path as import source

- Import types explicitly re-exported with "as":

from .Module import Module as Module
Otherwise ruff will regard the type as "imported but not used"
- Add "# ruff: noqa: E501" near the top. The import lines can get long and are beyond manual control (except for renaming the modules themselves, that is). This can cause ruff to fail, so get it to accept long lines in __init__.py. The style violation doesn't make much of a difference in generated code, anyway, because nobody reads that. Plus what's happening in the code isn't rocket science, so good style wouldn't help much with understanding, either.

This promptly digs up two symbol name conflicts lib.pm.dpkg and lib.pm.rpm. Fix them along with this commit to keep it from breaking the build.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-31 17:51:51 +02:00
22d87143a3
topdir.mk: Cleanup, add static code check targets
- Apply some style fixup to topdir.mk. Notably beautify indentation and move the target area down below the area with the include statements.

- Add the following targets:

format: check-syntax: check-format: check: check-syntax check-format
These targets currently don't do anything and are meant as hooks for individual linters to add dependencies.

- Make .PHONY depend on all phony non-pattern targets

- Make all phony pattern-targets depend on FORCE

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-31 16:53:27 +02:00
07e31015b5
Release 1.0.0-225@suse-tumbleweed/x86_64
All checks were successful
Test repo on all supported platforms / CI (push) Successful in 4m45s
2026-05-21 10:24:49 +00:00
36a16ddef5
Release 1.0.0-225@kali-rolling/amd64
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-21 10:11:47 +00:00
8a893f9dbb
Start version: 1.0.0-225
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-21 10:10:54 +00:00
99b57c5f4e
lib.Uri.basename: Add property

Add a property to get a file's basename. For

https://host.com/path/to/file?key=val

.basename should return "file"".

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-21 11:32:33 +02:00
fea4231b8e
pkg-dist.mk: Make pkg-release-reinstall: get-pub

Make pkg-release-reinstall depend on get-pub to do the obvious: Have the changes from Forgejo pull requests integrated by CI, too.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-14 16:09:25 +02:00
7046d0b696
Release 1.0.0-224@suse-tumbleweed/x86_64
All checks were successful
Test repo on all supported platforms / CI (push) Successful in 4m34s
2026-05-14 12:19:51 +00:00
cf8b3d45bd
Release 1.0.0-224@kali-rolling/amd64
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-14 12:07:15 +00:00
eb586c54e6
Start version: 1.0.0-224
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-14 12:06:27 +00:00
45f1105f34
topdir.mk: get-pub without JW_PKG_EXTRA_SSH_OPTS

Remove JW_PKG_EXTRA_SSH_OPTS before git pull in the context of get-pub / git-get-pub because it contains -l username, which collides with Forge-style git@<forge> remote URIs.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-14 13:56:28 +02:00
c0fc259de8
Release 1.0.0-223@suse-tumbleweed/x86_64 2026-05-14 11:11:48 +00:00
cd597d2c85
Release 1.0.0-223@kali-rolling/amd64
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-14 10:58:58 +00:00
a882220eb4
Start version: 1.0.0-223
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-14 10:58:10 +00:00
b038baf668
topdir.mk / projects-dir.mk: Add get-pub

Add get-pub for top directory / projects directory level. This is a janware specific target needed for CI. It integrates the current master branch from the new Forgejo-based Git repos.

That said, this will likely need to go along with other release machinery. Packaging is good, but releasing over a bunch of directories is an intricate process, as-is only usable by janware itself, and doesn't need to be part of jw-pkg.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-14 12:44:04 +02:00
ecbe9d20b3
defs.mk: Fix initial version 1.0.0-0-dev

If a project is not initialized via make pkg-init-%, it doesn't contain a VERSION file. When CI tries to build and package such a project, it auto-creates a VERSION file, but a broken one: The revision isn't properly seperated by a dash but by a dot, which makes CI give up while parsing it.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-14 11:46:41 +02:00
23c5c4269a
Release 1.0.0-222@suse-tumbleweed/x86_64 2026-05-13 23:22:28 +00:00
9ed64333d2
Release 1.0.0-222@kali-rolling/amd64
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-13 23:08:52 +00:00
f700b36597
Start version: 1.0.0-222
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-13 23:08:00 +00:00
ec92d89295
pkg.sh: release: Push without JW_PKG_SSH_EXTRA_OPTS

Currently, completing a release works with a plain git push. It may push to several repos, depending on how the client repo's origin's pushurl is configured. Those repos may have different user names, and if the ssh wrapper added -l via JW_PKG_SSH_EXTRA_OPTS, the push would fail. Hence, disable JW_PKG_SSH_EXTRA_OPTS for that case.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-13 12:54:50 +02:00
5eb4fc90eb
Release 1.0.0-221@kali-rolling/amd64
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-12 17:34:55 +00:00
df56361fb6
Release 1.0.0-221@suse-tumbleweed/x86_64 2026-05-12 15:33:08 +00:00
4d769237af
Start version: 1.0.0-221 2026-05-12 15:32:26 +00:00
f6f6e56943
make / scripts: git.janware.com -> devgit.janware.com

janware upstream development server moved from git.janware.com to devgit.janware.com. This commit follows the move with pretty much a simple

s/git.janware.com/devgit.janware.com/

over jw-pkg. It found 14 matches, that's pretty bad.

FIXME: Reduce the redundancy, or, better, replace the devgit.janware.com goodies by a more generally useful concept altogether.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-12 15:15:29 +02:00
b37667d4df
Release 1.0.0-220@suse-tumbleweed/x86_64
All checks were successful
Test repo on all supported platforms / CI (push) Successful in 4m27s
2026-05-07 23:26:22 +00:00
27bf44dab8
Release 1.0.0-220@kali-rolling/amd64
All checks were successful
Test repo on all supported platforms / CI (push) Successful in 4m29s
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-06 23:10:11 +00:00
3f116c3c61
Start version: 1.0.0-220
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-06 23:09:20 +00:00
237096cac9
lib.Uri: Add new convenience properties

Add a couple of properties and methods that come in handy when manipulating URIs:

.path .safe_full_with_username

do the obvious, and these return new Uri objects with modified paths:

.new_add_path() .new_replace_path()

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-06 15:26:14 +02:00
54f741f2f2
Release 1.0.0-219@suse-tumbleweed/x86_64
All checks were successful
Test repo on all supported platforms / CI (push) Successful in 4m27s
2026-05-05 23:24:08 +00:00
9d9c1c241c
Release 1.0.0-219@kali-rolling/amd64
All checks were successful
Test repo on all supported platforms / CI (push) Successful in 4m34s
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-05 23:09:53 +00:00
ff62f7183e
Start version: 1.0.0-219
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-05 23:09:01 +00:00
ff29d1f863
projects-dir.mk: push --force-with-lease

To make it easier to force-push feature branches, allow that, albeit under --force-with-lease protection.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-05 17:37:53 +02:00
38f13e922a
projects-dir.mk: git-show-ahead-of-master: Add target

Add a new target git-show-ahead-of-master, which does what git-show-pushable did up to now: List all repos where the currently checked-out branch is ahead of origin/master.

git-show-pushable now shows repos that have their checked-out branch ahead of their respective upstream branches. Which is truer to what the target's name suggests.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-05 17:22:14 +02:00
262be57741
cache.mk: Don't overwrite defined variables

Check with ifndef if a variable is defined before hard defining it in cache.mk. This gives more flexibility when overriding variables with local.mk.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-05 16:57:00 +02:00
38076c951b
cleandirs.mk: Fix: Descend into subdirectories

cleandirs.mk doesn't descend into subdirectories, because defs-dirs.mk is not included, and, hence FIND_SUBDIRS is undefined. Fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-05 16:55:44 +02:00
66be9c0aa5
Release 1.0.0-218@suse-tumbleweed/x86_64
All checks were successful
Test repo on all supported platforms / CI (push) Successful in 4m20s
2026-05-02 05:49:24 +00:00
17a0e2b657
Release 1.0.0-218@kali-rolling/amd64
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-02 05:32:40 +00:00
2eb56df718
Start version: 1.0.0-218
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-02 05:31:42 +00:00
c9b48880a9
cmds.pkg.CmdSelect: Fix argument order in select()

Argument ordering in the call to distro.select() is mixed up, the filter is mistaken for names, fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-02 07:19:41 +02:00
fc3ac69bd4
cmds.projects.CmdBuild: Don't change handled Exception

Exceptions raised by the build command are handled and changed, messing up the stack trace. Re-raise the original exception from the exception handler to fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-05-02 06:59:24 +02:00
69f1f3e071
Release 1.0.0-217@suse-tumbleweed/x86_64
All checks were successful
Test repo on all supported platforms / CI (push) Successful in 4m7s
Signed-off-by: janware DevOps <devops@janware.com>
2026-05-01 23:29:49 +00:00