projects, make: Follow pkg.recommends.jw in the build closure #121

Merged

Jan Lindemann merged 5 commits from jan/feature/20260922-build-recommends into master 2026-09-22 09:58:37 +02:00 AGit

Conversation 0 Commits 5 Files changed 4 +58 -22

Jan Lindemann commented 2026-09-22 09:48:27 +02:00

Owner

Copy link

This PR makes the relations of the workspace build closure a workspace property: projects build and required-os-pkg grow a --pkg-relations option, defaulting to requires, so direct invocations keep their behaviour; DEP_PROJECTS is derived from the very build order that make all and the workspace mount use; and a new PKG_RELATIONS_BUILD variable threads the choice through every build invocation of the workspace. The final commit sets it to requires,recommends, so that recommended projects get built and released along with their recommenders by default.

cmds.projects.CmdBuild: Add --pkg-relations

The relations the build closure of projects build follows are hard-coded in read_deps(): [pkg.requires.jw] only. A workspace that also wants to build the projects its seeds recommend in [pkg.recommends.jw] has no way to say so.

Add a --pkg-relations option that lists the relations between jw packages to take into consideration for the build, comma or space separated, defaulting to requires.

cmds.projects.CmdRequiredOsPkg: Add --pkg-relations

The OS package list of required-os-pkg, like the build closure, is derived from the [pkg.requires.jw] section only, hard-coded in _run(). Add a --pkg-relations option to required-os-pkg, mirroring the one of CmdBuild.

projects-dir.mk: Derive DEP_PROJECTS from the build order

DEP_PROJECTS is computed with pkg-requires --recursive, which follows [pkg.requires.jw] only. That set does not match what the build actually builds, and it omits seed projects that no other project of the closure depends on.

Derive DEP_PROJECTS from projects build --build-order with the same dependency flavours as make all, the very command the build-order make target and the workspace mount closure (mount-projects-dir.sh) use. DEP_PROJECTS is now exactly the build closure, so the file listings, the text-files cache and the git helpers of a workspace cover the same project set as make all.

Introduce the PKG_RELATIONS_BUILD variable, defaulting to requires, and pass it through JW_PKG_PY_BUILD to every build invocation of the workspace, so the relations of the build closure are a workspace property.

projects-dir.mk: Add JW_PKG_PY_REQUIRED_OS_PKG

Add and use JW_PKG_PY_REQUIRED_OS_PKG. The variable and its use effectively ties more targets to act on the same package set as the make all, influenced by the contents of $(PKG_RELATIONS_BUILD):

• echo-build-deps
• echo-install-deps
• echo-release-deps
• pkg-install-build-deps
• pkg-install-release-deps

projects-dir.mk: PKG_RELATIONS_BUILD += recommends

Add recommended projects into the build closure. Would be nice if they got built along. Let's see if nightly survives it.

This PR makes the relations of the workspace build closure a workspace property: `projects build` and `required-os-pkg` grow a `--pkg-relations` option, defaulting to requires, so direct invocations keep their behaviour; `DEP_PROJECTS` is derived from the very build order that `make all` and the workspace mount use; and a new `PKG_RELATIONS_BUILD` variable threads the choice through every build invocation of the workspace. The final commit sets it to requires,recommends, so that recommended projects get built and released along with their recommenders by default. #### cmds.projects.CmdBuild: Add --pkg-relations The relations the build closure of `projects build` follows are hard-coded in `read_deps()`: [`pkg.requires.jw`] only. A workspace that also wants to build the projects its seeds recommend in [`pkg.recommends.jw`] has no way to say so. Add a `--pkg-relations` option that lists the relations between jw packages to take into consideration for the build, comma or space separated, defaulting to requires. #### cmds.projects.CmdRequiredOsPkg: Add --pkg-relations The OS package list of `required-os-pkg`, like the build closure, is derived from the [`pkg.requires.jw`] section only, hard-coded in `_run()`. Add a `--pkg-relations` option to `required-os-pkg`, mirroring the one of `CmdBuild`. #### projects-dir.mk: Derive DEP_PROJECTS from the build order `DEP_PROJECTS` is computed with `pkg-requires` `--recursive`, which follows [`pkg.requires.jw`] only. That set does not match what the build actually builds, and it omits seed projects that no other project of the closure depends on. Derive `DEP_PROJECTS` from `projects build` `--build-order` with the same dependency flavours as `make all`, the very command the build-order make target and the workspace mount closure (`mount-projects-dir.sh`) use. `DEP_PROJECTS` is now exactly the build closure, so the file listings, the text-files cache and the git helpers of a workspace cover the same project set as `make all`. Introduce the `PKG_RELATIONS_BUILD` variable, defaulting to requires, and pass it through `JW_PKG_PY_BUILD` to every build invocation of the workspace, so the relations of the build closure are a workspace property. #### projects-dir.mk: Add JW_PKG_PY_REQUIRED_OS_PKG Add and use `JW_PKG_PY_REQUIRED_OS_PKG`. The variable and its use effectively ties more targets to act on the same package set as the `make all`, influenced by the contents of `$(PKG_RELATIONS_BUILD)`: - `echo-build-deps` - `echo-install-deps` - `echo-release-deps` - `pkg-install-build-deps` - `pkg-install-release-deps` #### projects-dir.mk: PKG_RELATIONS_BUILD += recommends Add recommended projects into the build closure. Would be nice if they got built along. Let's see if nightly survives it.

Jan Lindemann added 5 commits 2026-09-22 09:48:27 +02:00

cmds.projects.CmdBuild: Add --pkg-relations ... 5f98de8f5a

The relations the build closure of projects build follows are hard-coded in
read_deps(): [pkg.requires.jw] only. A workspace that also wants to build
the projects its seeds recommend in [pkg.recommends.jw] has no way to say
so.

Add a --pkg-relations option that lists the relations between jw packages
to take into consideration for the build, comma or space separated,
defaulting to requires.

Signed-off-by: Jan Lindemann <jan@janware.com>
Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.86.1

cmds.projects.CmdRequiredOsPkg: Add --pkg-relations ... 32dd507cf5

The OS package list of required-os-pkg, like the build closure, is derived
from the [pkg.requires.jw] section only, hard-coded in _run(). Add a
--pkg-relations option to required-os-pkg, mirroring the one of CmdBuild.

Signed-off-by: Jan Lindemann <jan@janware.com>
Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.86.1

projects-dir.mk: Derive DEP_PROJECTS from the build order ... 1151104328

DEP_PROJECTS is computed with pkg-requires --recursive, which follows
[pkg.requires.jw] only. That set does not match what the build actually
builds, and it omits seed projects that no other project of the closure
depends on.

Derive DEP_PROJECTS from projects build --build-order with the same
dependency flavours as make all, the very command the build-order make
target and the workspace mount closure (mount-projects-dir.sh) use.
DEP_PROJECTS is now exactly the build closure, so the file listings, the
text-files cache and the git helpers of a workspace cover the same project
set as make all.

Introduce the PKG_RELATIONS_BUILD variable, defaulting to requires, and
pass it through JW_PKG_PY_BUILD to every build invocation of the workspace,
so the relations of the build closure are a workspace property.

Signed-off-by: Jan Lindemann <jan@janware.com>
Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.86.1

projects-dir.mk: Add JW_PKG_PY_REQUIRED_OS_PKG ... fa8b9d5156

Add and use JW_PKG_PY_REQUIRED_OS_PKG. The variable and its use effectively
ties more targets to act on the same package set as the make all, influenced
by the contents of $(PKG_RELATIONS_BUILD):

  echo-build-deps
  echo-install-deps
  echo-release-deps
  pkg-install-build-deps
  pkg-install-release-deps

Signed-off-by: Jan Lindemann <jan@janware.com>

projects-dir.mk: PKG_RELATIONS_BUILD += recommends ... c7c9779e40

Add recommended projects into the build closure. Would be nice if they got
built along. Let's see if nightly survives it.

Signed-off-by: Jan Lindemann <jan@janware.com>

Jan Lindemann scheduled this pull request to auto merge when all checks succeed 2026-09-22 09:48:28 +02:00

Jan Lindemann merged commit c7c9779e40 into master 2026-09-22 09:58:37 +02:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

janware/jw-pkg!121

No description provided.