From adec7fd7ad69e8a49a44a324196aa9ae1aac0107 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 11 Dec 2022 19:21:17 -0600 Subject: [PATCH] Rewrite tupfiles --- Tuprules.tup | 1 - src/preserves/Tupfile | 3 +-- src/preserves/private/Tupfile | 9 ++++++++- tests/Tupfile | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 Tuprules.tup diff --git a/Tuprules.tup b/Tuprules.tup deleted file mode 100644 index 6c7b69a..0000000 --- a/Tuprules.tup +++ /dev/null @@ -1 +0,0 @@ -.gitignore diff --git a/src/preserves/Tupfile b/src/preserves/Tupfile index aadee18..d6bea78 100644 --- a/src/preserves/Tupfile +++ b/src/preserves/Tupfile @@ -1,3 +1,2 @@ include_rules -NIM_PATH += --path:$(TUP_CWD)/.. -: foreach *.nim |> !nim_run |> +: foreach preserves_schema_nim.nim schemac.nim |> !nim |> $(BIN_DIR)/%B | $(BIN_DIR)/<%B> diff --git a/src/preserves/private/Tupfile b/src/preserves/private/Tupfile index d5b997f..d6cf93e 100644 --- a/src/preserves/private/Tupfile +++ b/src/preserves/private/Tupfile @@ -1,2 +1,9 @@ include_rules -: preserves_encode.nim |> !nim |> +GROUP = $(BIN_DIR)/ +: preserves_encode.nim |> !nim |> $(BIN_DIR)/preserves_encode | $(GROUP) {bin} +!link = |> ^o symlink %o^ ln -s preserves_encode %o |> | $(GROUP) +: {bin} |> !link |> $(BIN_DIR)/preserves_decode +: {bin} |> !link |> $(BIN_DIR)/preserves_from_json +: {bin} |> !link |> $(BIN_DIR)/preserves_from_xml +: {bin} |> !link |> $(BIN_DIR)/preserves_to_json +: {bin} |> !link |> $(BIN_DIR)/preserves_to_xml diff --git a/tests/Tupfile b/tests/Tupfile index bcffaf2..f23e8b0 100644 --- a/tests/Tupfile +++ b/tests/Tupfile @@ -1,2 +1,2 @@ include_rules -: foreach test_*.nim | ../../ |> !nim_run |> +: foreach test_*.nim |> !nim_run |>