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
This commit is contained in:
Přemek Vyhnal 2022-02-06 17:37:47 +01:00 committed by GitHub
parent 17d109a15e
commit 3552fb77bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions

View file

@ -1,6 +1,6 @@
# See docs/installing.md # See docs/installing.md
build: nodes localnet haveno build: localnet haveno
clean: clean:
./gradlew clean ./gradlew clean
@ -11,9 +11,6 @@ clean-localnet:
localnet: localnet:
mkdir -p .localnet mkdir -p .localnet
nodes: localnet
./scripts/haveno_deps.sh
haveno: haveno:
./gradlew build ./gradlew build
@ -159,7 +156,7 @@ monero-private2:
--rpc-login superuser:abctesting123 \ --rpc-login superuser:abctesting123 \
--rpc-access-control-origins http://localhost:8080 \ --rpc-access-control-origins http://localhost:8080 \
--fixed-difficulty 100 --fixed-difficulty 100
funding-wallet: funding-wallet:
./.localnet/monero-wallet-rpc \ ./.localnet/monero-wallet-rpc \
--stagenet \ --stagenet \

View file

@ -363,6 +363,13 @@ configure(project(':core')) {
test { test {
systemProperty 'jdk.attach.allowAttachSelf', true 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')) { configure(project(':cli')) {