From c77fe46a488f8ecd541a50f176b5d4b187339295 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 10 Jun 2024 17:20:57 +0300
Subject: [PATCH] Build system refactoring

---
 Tupfile            |  4 ++--
 Tuprules.jq        | 10 +++++-----
 Tuprules.tup       |  1 -
 src/schema/Tupfile |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Tupfile b/Tupfile
index 4e8eb8c..23e14fa 100644
--- a/Tupfile
+++ b/Tupfile
@@ -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
diff --git a/Tuprules.jq b/Tuprules.jq
index 58af1ef..074e310 100755
--- a/Tuprules.jq
+++ b/Tuprules.jq
@@ -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")
diff --git a/Tuprules.tup b/Tuprules.tup
index 9ec7f07..4989d80 100644
--- a/Tuprules.tup
+++ b/Tuprules.tup
@@ -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>
diff --git a/src/schema/Tupfile b/src/schema/Tupfile
index adafa51..154988e 100644
--- a/src/schema/Tupfile
+++ b/src/schema/Tupfile
@@ -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>