Build system refactoring

This commit is contained in:
Emery Hemingway 2024-06-10 17:20:57 +03:00
parent 624cc7513a
commit c77fe46a48
4 changed files with 8 additions and 9 deletions

View File

@ -4,5 +4,5 @@ include_rules
run ./Tuprules.jq sbom.json
: foreach {bin} |> !assert_built |>
: $(BIN_DIR)/msg |> !symlink |> $(BIN_DIR)/beep
: $(BIN_DIR)/msg |> !symlink |> $(BIN_DIR)/assert
: &(BIN_DIR)/msg |> !symlink |> &(BIN_DIR)/beep
: &(BIN_DIR)/msg |> !symlink |> &(BIN_DIR)/assert

View File

@ -1,12 +1,12 @@
#! /usr/bin/env -S jq --raw-output --from-file
.metadata.component.properties as $props |
$props |
["."] + (
map( select(.name | .[0:10] == "nim:srcDir") ) +
map( select(.name | .[0:10] == "nim:binDir") ) |
map(.value)) | .[-1] as $binDir |
( map( select(.name | .[0:10] == "nim:binDir") ) +
map( select(.name | .[0:10] == "nim:srcDir") ) |
map( .value )
) + ["."] | .[0] as $binDir |
$props |
map( select(.name | .[0:8] == "nim:bin:") ) |
map( ": \($binDir)/\(.value).nim |> !nim_bin |> $(BIN_DIR)/\(.name[8:]) {bin}" ) |
map( ": \($binDir)/\(.value).nim |> !nim_bin |> &(BIN_DIR)/\(.name[8:]) {bin}" ) |
join("\n")

View File

@ -2,7 +2,6 @@ include ../syndicate-nim/depends.tup
PROJECT_DIR = $(TUP_CWD)
NIM = $(DIRENV) $(NIM)
NIM_FLAGS += --path:$(PROJECT_DIR)/../syndicate-nim/src
NIM_GROUPS += $(SYNDICATE_PROTOCOL)
NIM_GROUPS += $(PROJECT_DIR)/<lock>
NIM_GROUPS += $(PROJECT_DIR)/<schema>

View File

@ -1,2 +1,2 @@
include_rules
: foreach ../../*.prs |> !preserves_schema_nim |> %B.nim | $(PROJECT_DIR)/<schema>
: foreach ../../*.prs |> !preserves-schema-nim |> %B.nim | $(PROJECT_DIR)/<schema>