From 3552fb77bd8800d0ffce75f48095b1b98b89804f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emek=20Vyhnal?=
 <1145361+premek@users.noreply.github.com>
Date: Sun, 6 Feb 2022 17:37:47 +0100
Subject: [PATCH] run haveno_deps script on gradle build instead of from make
 (#230)

Closes #184

Maybe it would be "nicer" to download the binaries with a gradle task utilising gradle tasks' inputs and outputs but that's for someone more skilled with gradle
---
 Makefile     | 7 ++-----
 build.gradle | 7 +++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2068b651f1..61cb3d1210 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # See docs/installing.md
 
-build: nodes localnet haveno
+build: localnet haveno
 
 clean:
 	./gradlew clean
@@ -11,9 +11,6 @@ clean-localnet:
 localnet:
 	mkdir -p .localnet
 
-nodes: localnet
-	./scripts/haveno_deps.sh
-
 haveno:
 	./gradlew build
 
@@ -159,7 +156,7 @@ monero-private2:
 		--rpc-login superuser:abctesting123 \
 		--rpc-access-control-origins http://localhost:8080 \
 		--fixed-difficulty 100
-		
+
 funding-wallet:
 	./.localnet/monero-wallet-rpc \
 		--stagenet \
diff --git a/build.gradle b/build.gradle
index 22b31b20d9..483ab1ce40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -363,6 +363,13 @@ configure(project(':core')) {
     test {
         systemProperty 'jdk.attach.allowAttachSelf', true
     }
+
+    task havenoDeps(type: Exec) {
+        workingDir '..'
+        commandLine './scripts/haveno_deps.sh'
+    }
+    if (osdetector.os != 'windows') processResources.dependsOn havenoDeps // before both test and build
+    else println "Haveno dependencies must be downloaded manually on Windows"
 }
 
 configure(project(':cli')) {