Commit graph

2,099 commits

Author SHA1 Message Date
3d4ecbc508 gettext.mk: Remove $(GETTEXT_PROJECT_POT): $(GETTEXT_INPUT_FILES) dependency

$(GETTEXT_PROJECT_POT) is always generated if $(GETTEXT_INPUT_FILES) are newer than it. Having this happen automatically is not useful, since it can break manually edited and version controlled $(GETTEXT_PROJECT_POT).

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-06-04 02:23:24 +00:00
3aff3b4559 defs.mk: Add target echo-targets

echo-targets prints a list of targets provided by the invoked Makefile.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-05-30 07:19:55 +00:00
bf94282ab5 svg.mk: Unset DISPLAY in inkscape invocation

It appears that inkscape, if invoked from the command line, fires up a splash screen if it has enough time to do so. This leads to strange flickering during the build process. Unset DISPLAY in the attempt to keep that from happening.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-05-11 10:58:31 +00:00
ccc8725dff gettext.mk: Use pattern rule %.po: %pot

Currently, there's a $(GETTEXT_PROJECT_PO): $(GETTEXT_POT) rule, but since updates to the workflow now considers, allows and mandates one or multiple *.pot files as the authoritative source for translations, make this a pattern rule rather than only valid for $(GETTEXT_POT).

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-02-22 12:40:45 +00:00
60ef137bc3 projects.mk, py-defs.mk, py-version.mk: Add py-version.mk

This commit adds py-version.mk, eliminating redundancy between projects.mk and py-defs.mk in setting up the Python version early.

2025-02-22 09:04:17 +00:00
e53032ab9c gettext.mk: Support GETTEXT_INPUT_EXTS

GETTEXT_INPUT_EXTS takes a whitespace separated list of extensions which are subsequently passed to find -name to locate source files which are meant to be run through xgettext.

The first argument to find, translateme, is not really meant to exist, it's just there to allow adding multiple extensions preceded by -o in a $(foreach) loop.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-02-22 08:41:13 +00:00
e20cb706a5 project.conf: Change OS dependency python -> python3
Signed-off-by: Jan Lindemann <jan@janware.com>
2025-02-21 06:09:26 +00:00
39a558d3a1 gettext.mk: Try to re-organize workflow

Try to make the workflow a little more versatile. As of this commit, .pot files are assumed to preexist, save $(GETTEXT_PROJECT_POT), which can be generated from source, and should be committed, too.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-02-17 17:13:09 +00:00
a64cd918dd py-run.mk: Add dummy test target

Directories with py-run.mk error out on the test target, so add a no-op test target.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-02-17 17:06:29 +00:00
a0b8deec21 htdocs.mk: Lint php files via prettier if it's installed
Signed-off-by: Jan Lindemann <jan@janware.com>
2025-02-17 17:06:28 +00:00
77b2c49e28 conf.mk: Add dummy test target

Directories with conf.mk error out on the test target, so add a no-op test target.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-02-17 17:06:26 +00:00
57e63b2582 gettext.mk: Create a LC_MESSAGES link to .

A directory with gettext.mk in it, provided it has a locale name, makes the parent directory to a working localedir, which can be used from within the janware source tree, so add it with the all target and remove it with clean.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-01-30 09:24:43 +00:00
07d9eeea42 py-mod.mk: Support PY_INIT_FILTER
Signed-off-by: Jan Lindemann <jan@janware.com>
2025-01-27 15:00:40 +00:00
eb22977054 htdocs.mk: Run linters prettier and php -l with all target
Signed-off-by: Jan Lindemann <jan@janware.com>
2025-01-16 08:17:25 +00:00
b181f76343 py-run.mk: Fix argument list (use $@ instead of $*)
Signed-off-by: Jan Lindemann <jan@janware.com>
2025-01-15 19:32:23 +00:00
de893a0fe5 py-mod.mk: Fix bogus # export match in commented line
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-12-22 14:06:09 +00:00
90ce1b5196 py-mod.mk: Fix bogus # export match on class {variable}
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-12-18 17:14:23 +00:00
6fb6f1608f subdirs.mk: Don't use undefined $(FIND)

subdirs.mk uses $(FIND), which is defined in defs.mk, include that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2024-12-11 10:12:35 +00:00
49f4b42d0c doxygen.mk: Fix broken doxygen HTML generation invocation

doxygen needs to be called as

doxygen -w html header-file footer-file stylesheet config-file

The invocation contains the logo, though, which has no business there. Fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2024-12-11 10:12:34 +00:00
349f1d2602 Makefile: Add target text-files-list-0

text-files-list-0 returns a zero-delimited list of text files for further processing, which allows to correctly handle spaces in file names

Signed-off-by: Jan Lindemann <jan@janware.com>
2024-12-09 08:31:32 +00:00
c575537456 defs.mk / rules.mk: Add support for PACKAGE_INSTALL_DIR

PACKAGE_INSTALL_DIR, true by default, can be used to turn off target dir creation from a directory to avoid duplication from other packages

Signed-off-by: Jan Lindemann <jan@janware.com>
2024-12-06 14:35:59 +00:00
86ec95f6dc defs.mk / rules.mk: Add .target file support to LOCAL_SYSTEMD
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-12-03 12:28:15 +00:00
4e405a5d1a py-mod.mk: Add support to # extract variables
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-12-03 12:27:39 +00:00
e446df30e5 make/rpmdist.mk: Add target echo-pkg

Add echo-pkg target to debug packaging related variables.

Signed-off-by: Jan Lindemann <jan@janware.com>
2024-12-03 12:26:34 +00:00
f9193c989d py-run.mk: Add target run.sh

Allow creation of a run.sh script, to be used from outside the make context.

Signed-off-by: Jan Lindemann <jan@janware.com>
2024-12-03 12:26:33 +00:00
2989cc87c8 Makefile: JWB_SCRIPT_DIR: Add support for /opt/jw-build/bin
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-07-16 15:21:15 +00:00
90aeeaab10 rpmdist.mk: Pass absolute path to sudo rpm -U

The idea is to make passwordless RPM package installation via sudo a little safer.

Signed-off-by: Jan Lindemann <jan@janware.com>
2024-07-16 11:02:54 +00:00
a1bf4d9562 make: Remove variables referencing other janware-projects

jw-build is meant as a generic set of tools for building other projects, so references to projects being built by jw-build introduce a circular dependency. Remove those references from defs.mk and rules.mk.

Variables removed by this commit:

BTOOLS_DIR FEEDFSD_DIR FEEDFS_DIR FEEDFS_GUI_DIR FEEDFS_OBJECTS_DIR FEEDFS_UTILS_DIR FEEDFS_WT_DIR JUX_SHARED_DIR SITE_DIR VALDI_DIR XCHANGE_DIR
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-07-16 10:41:20 +00:00
a343cf7806 pkg-install-%-deps: Protect projects from shell with quotes

Project names passed to the package manager can contain characters not well digested by the shell. Don't let it.

Signed-off-by: Jan Lindemann <jan@janware.com>
2024-06-30 17:01:18 +00:00
19bc4037c0 Makefile: Make list-files consider build dependencies, too
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-06-25 17:35:35 +00:00
9a5bc11cd0 py-defs.mk: Fix: mypy finds modules unter multiple paths
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-06-04 08:56:19 +00:00
391a735972 swig.mk: Follow changes swig 4.0 -> 4.2
- There's no -php8 option in swig, so stay with -php7, which supports "8 and above" according to the documentation
- No <module>.php stub is generated anylonger, so don't try to install it
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-04-30 08:00:37 +00:00
39d3a9e888 decompress.mk, defs-cpp.mk: Add make/decompress.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-04-21 11:05:55 +00:00
2187d1b089 topdir.mk: Fix missing JANWARE_USER for git.janware.com login
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-01-12 14:36:38 +00:00
40ac901eb6 py-run.mk: Add test.py to EXE search path
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-01-12 14:35:39 +00:00
015072ca19 upload-defs.mk: Add support for UPLOAD_PROTOCOL

UPLOAD_PROTOCOL is a variable which can be defined by the including Makefile to tweak the protocol an upload is done over

Signed-off-by: Jan Lindemann <jan@janware.com>
2023-12-18 13:00:43 +00:00
ae1a4dd242 svg.mk: Inkscape --export-pdf is not supported anylonger

inkscape --export-pdf is not supported anylonger, replace that with --export-filename.

Signed-off-by: Jan Lindemann <jan@janware.com>
2023-12-18 13:00:42 +00:00
069b82b3cd defs.mk: Beautify INSTALLED_RSYSLOG variable

INSTALLED_RSYSLOG contained duplicates, fix that

Signed-off-by: Jan Lindemann <jan@janware.com>
2023-12-18 13:00:40 +00:00
ce7044808f project.conf: Python -> python3 on Debian

Ubuntu 22.04 (and supposedly all Debian based distros) don't have a package called python anylonger, and use python3 instead. Using the unversioned [requires] sections for simplicity. Note that this might break backwards compatibility, and should be fixed as necessary.

Signed-off-by: Jan Lindemann <jan@janware.com>
2023-07-07 08:48:00 +00:00
17851c9d11 projects.mk / py-defs.mk: Support Python 3.10

The current globbing pattern for filling the PYTHON variable doesn't account for the fact that /usr/bin/python3.X might have more than one digit for X, fix that

Signed-off-by: Jan Lindemann <jan@janware.com>
2022-10-04 11:05:24 +00:00
c87986624f py-mods.mk: Add missing py.clean

py.clean is not run for clean target, fix that

Signed-off-by: Jan Lindemann <jan@janware.com>
2022-10-04 11:03:29 +00:00
53491b490d debugger.mk: Remove .gdb_history with distclean target
Signed-off-by: Jan Lindemann <jan@janware.com>
2021-01-15 10:58:29 +00:00
d6e1eaf547 depend.mk: Make .o.dep.mk also depend on $(SRC_H)

This should prevent some errors during compilation.

Signed-off-by: Jan Lindemann <jan@janware.com>
2020-12-01 16:24:43 +00:00
c43fd8d0aa defs-cpp.mk: Add .hh to LOCAL_H
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-12-01 16:24:42 +00:00
cec581c8f6 vim.mk: Add variable INSTALL_VIM_SYSTEM_PATH

Add INSTALL_VIM_SYSTEM_PATH for use in including makefiles

Signed-off-by: Jan Lindemann <jan@janware.com>
2020-12-01 16:21:21 +00:00
0596109c36 run.mk: Add variable EXE_CMD

Add variable EXE_CMD to be overriden in including makefiles

Signed-off-by: Jan Lindemann <jan@janware.com>
2020-12-01 16:21:20 +00:00
8d2b093cc6 defs.mk: Replace tr invocations by $(TR)
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-12-01 16:21:19 +00:00
50988845d7 defs.mk: Add .hh to SRC_H
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-11-30 16:52:50 +00:00
4ebe82970f projects-dir.mk: Make INTERACTIVE=true default
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-11-30 13:32:30 +00:00
e06ead38cc swig.mk, defs-(dist|dev).mk: Fix Python 3 support

python38.pc doesn't exist on OpenSUSE Tumbleweed, python-38.pc does, so use that naming scheme. Also allow installation with DEVELOPMENT=true, failed with the attempt to install as root user before.

Signed-off-by: Jan Lindemann <jan@janware.com>
2020-11-21 13:09:15 +00:00