| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
4823463b88
|
common.mk: Add file
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 5m4s
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 7m20s
CI / Packaging test (pull_request) Successful in 0s
CI / Packaging - Kali Linux (push) Successful in 5m14s
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 7m2s
CI / Packaging test (push) Successful in 0s
This is the first in a series of attempts to clean up jw-pkg's makefile fragments make/*.mk. It collects redundantly defined workspace and project variables into one shared common.mk. Variables needed in both the workspace directory and the project directories are defined separately in the two contexts: Q in defs.mk and projects-dir-minimal.mk, INTERACTIVE in topdir.mk and projects-dir.mk, BROWSER and JWB_SCRIPT_DIR in defs.mk/platform.mk and projects-dir.mk, and LIST_VCS_FILES and LIST_VCS_FILES_SH wrapping the same scm.sh ls-files call under different names. PKG_MANAGER is defined in topdir.mk and projects-dir.mk, and JW_PKG_PY_PROJECTS is a prefix only used to build two other variables in projects-dir.mk. This commit adds make/common.mk, included from defs.mk (and hence from every project directory) and from projects-dir.mk (the workspace), and collects the shared variables there: - Q, INTERACTIVE, BROWSER, JWB_SCRIPT_DIR: one ?= definition each - LIST_VCS_FILES: one definition; LIST_VCS_FILES_SH is dropped and the list-files target uses the shared name - PKG_MANAGER moves to projects+project.mk, the fragment shared by the workspace and the topdir - projects-dir-minimal.mk keeps its own Q, because the bootstrap recipes run before common.mk is parsed - JW_PKG_PY_PROJECTS is inlined into JW_PKG_PY_BUILD and JW_PKG_PY_REQUIRED_OS_PKG Signed-off-by: Jan Lindemann <jan@janware.com> Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.87.0 |
|||
|
7cec102691
|
scm.sh ls-files: Honor -f in Git repositories
In CVS, the -f option keeps directory entries out of scm.sh ls-file's listing; in Git, it's a silent no-op. Notably symlinks are not excluded despite -f. Implement -f for git with a mode filter on git ls-files -s output: only 100644 and 100755 entries are listed, so the option means the same thing in both code paths. For Git, this actually means a behaviour change which needs to be fixed: The dist archive targets tar-files and cpio-files in make/list-files.mk and the scm_files() helper in scripts/pkg.sh then may no longer pass it to get unchanged behaviour. The targets list-files and list-text-files keep it, so the text-files cache now matches its documented regular-files-only membership. Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.85.1 Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| ed17aaa6c9 |
make: Align equal signs in *.mk to column 30
Chore: Format equal signs uniformly. They should all be at column 30 but aren't. Fix that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| f869b5aaca |
defs.mk: Define Q and use it in *.mk
Define Q ?= @, and replace @<command> in recipes by $(Q)<command>. Meant to be overridden from the environment for debugging as in Q= make Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| bdd66dbc26 |
Everywhere: Rename MOD_SCRIPT_DIR -> JWB_SCRIPT_DIR
Follow name change of MODDIR -> JWBDIR. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| e0486a936e |
make/Makefile, list-files.mk: Code beautification
Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| d84260a2ad |
listfiles.mk: Fix cpio --directory option
cpio -D doesn't mean the same thing for different versions of cpio, --directory does, so use that Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 9b41d4eefc |
dev-utils.mk, list-files.mk, topdir.mk: Extract from dev-utils.mk and topdir.mk
Signed-off-by: Jan Lindemann <jan@janware.com> |