From 7aa424ad19b34371acd9ea73f0531cb151d64de6 Mon Sep 17 00:00:00 2001 From: Herr Seppia Date: Wed, 4 Oct 2023 10:38:44 +0200 Subject: [PATCH 1/2] rusk: add `build` recipe to Makefile --- rusk/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rusk/Makefile b/rusk/Makefile index c9c6618a22..5447167d34 100644 --- a/rusk/Makefile +++ b/rusk/Makefile @@ -11,4 +11,7 @@ clippy: ## Run clippy @cargo clippy --all-features --release -- -D warnings @cargo clippy --no-default-features --release -- -D warnings -.PHONY: test help clippy +build: ## Build rusk binary + @cargo build --release + +.PHONY: test help clippy build From d4926de536d02d617cbede0d48b854b9886f26ec Mon Sep 17 00:00:00 2001 From: Herr Seppia Date: Wed, 4 Oct 2023 10:39:10 +0200 Subject: [PATCH 2/2] workspace: Fix `all` recipe Resolves #1056 --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 508993e5ac..fd3744ea9f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: circuits keys wasm abi allcircuits state contracts node ## Build everything +all: circuits keys wasm abi allcircuits state contracts rusk ## Build everything help: ## Display this help screen @grep -h \ @@ -14,7 +14,7 @@ circuits: ## Compress and store all circuits keys: circuits ## Create the keys for the circuits $(MAKE) -C ./rusk-recovery keys -state: wasm ## Create the network state +state: keys wasm ## Create the network state $(MAKE) -C ./rusk-recovery state wasm: ## Generate the WASM for all the contracts @@ -53,7 +53,7 @@ clippy: ## Run clippy$(MAKE) -C ./rusk-abi/ $@ run: keys state ## Run the server cargo run --release --bin rusk -node: rusk ## Build node binary - $(MAKE) -C ./node binary +rusk: keys state ## Build rusk binary + $(MAKE) -C ./rusk build -.PHONY: all abi circuits keys state wasm allcircuits contracts test run help node +.PHONY: all abi circuits keys state wasm allcircuits contracts test run help rusk