mirror of
https://github.com/haveno-dex/haveno.git
synced 2024-11-16 15:58:08 +00:00
rename bisq-* executables to haveno-* (#63)
This commit is contained in:
Přemek Vyhnal
GitHub
parent
3157891bbb
commit
bd8f210080
4 changed files with 31 additions and 31 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -22,7 +22,7 @@ build
|
|||
*.java.hsw
|
||||
*.~ava
|
||||
/bundles
|
||||
/bisq-*
|
||||
/haveno-*
|
||||
/lib
|
||||
/xchange
|
||||
desktop.ini
|
||||
|
|
|
|||
24
Makefile
24
Makefile
|
|
@ -35,13 +35,13 @@
|
|||
# the various Bisq seed and desktop nodes that will make up your
|
||||
# localnet:
|
||||
#
|
||||
# $ ls -1 bisq-*
|
||||
# bisq-desktop
|
||||
# bisq-monitor
|
||||
# bisq-pricenode
|
||||
# bisq-relay
|
||||
# bisq-seednode
|
||||
# bisq-statsnode
|
||||
# $ ls -1 haveno-*
|
||||
# haveno-desktop
|
||||
# haveno-monitor
|
||||
# haveno-pricenode
|
||||
# haveno-relay
|
||||
# haveno-seednode
|
||||
# haveno-statsnode
|
||||
#
|
||||
# - You will see a new '.localnet' directory containing the data dirs
|
||||
# for your regtest Bitcoin and Bisq nodes. Once you've deployed them in
|
||||
|
|
@ -189,7 +189,7 @@ bitcoind: .localnet
|
|||
-blocknotify='.localnet/bitcoind/blocknotify %s'
|
||||
|
||||
seednode: seednode/build
|
||||
./bisq-seednode \
|
||||
./haveno-seednode \
|
||||
--baseCurrencyNetwork=XMR_STAGENET \
|
||||
--useLocalhostForP2P=true \
|
||||
--useDevPrivilegeKeys=true \
|
||||
|
|
@ -202,7 +202,7 @@ seednode: seednode/build
|
|||
--appName=seednode
|
||||
|
||||
seednode2: seednode/build
|
||||
./bisq-seednode \
|
||||
./haveno-seednode \
|
||||
--baseCurrencyNetwork=XMR_STAGENET \
|
||||
--useLocalhostForP2P=true \
|
||||
--useDevPrivilegeKeys=true \
|
||||
|
|
@ -215,7 +215,7 @@ seednode2: seednode/build
|
|||
--appName=seednode2
|
||||
|
||||
mediator: desktop/build
|
||||
./bisq-desktop \
|
||||
./haveno-desktop \
|
||||
--baseCurrencyNetwork=XMR_STAGENET \
|
||||
--useLocalhostForP2P=true \
|
||||
--useDevPrivilegeKeys=true \
|
||||
|
|
@ -224,7 +224,7 @@ mediator: desktop/build
|
|||
--appName=Mediator
|
||||
|
||||
alice: setup
|
||||
./bisq-desktop \
|
||||
./haveno-desktop \
|
||||
--baseCurrencyNetwork=XMR_STAGENET \
|
||||
--useLocalhostForP2P=true \
|
||||
--useDevPrivilegeKeys=true \
|
||||
|
|
@ -239,7 +239,7 @@ alice: setup
|
|||
--appName=Alice
|
||||
|
||||
bob: setup
|
||||
./bisq-desktop \
|
||||
./haveno-desktop \
|
||||
--baseCurrencyNetwork=XMR_STAGENET \
|
||||
--useLocalhostForP2P=true \
|
||||
--useDevPrivilegeKeys=true \
|
||||
|
|
|
|||
|
|
@ -58,10 +58,10 @@ See the [FAQ in the wiki](https://github.com/haveno-dex/haveno/wiki/FAQ).
|
|||
11. `cd haveno`
|
||||
12. `./gradlew build`
|
||||
13. Start seed node, arbitrator, Alice, and Bob:
|
||||
1. `./bisq-seednode --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=2002 --appName=bisq-XMR_STAGENET_Seed_2002 --daoActivated=false`
|
||||
2. `./bisq-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=4444 --appName=bisq-XMR_STAGENET_arbitrator --daoActivated=false --apiPassword=apitest --apiPort=9998`
|
||||
3. `./bisq-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=5555 --appName=bisq-XMR_STAGENET_Alice --daoActivated=false --apiPassword=apitest --apiPort=9999`
|
||||
4. `./bisq-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=6666 --appName=bisq-XMR_STAGENET_Bob --daoActivated=false --apiPassword=apitest --apiPort=10000`
|
||||
1. `./haveno-seednode --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=2002 --appName=bisq-XMR_STAGENET_Seed_2002 --daoActivated=false`
|
||||
2. `./haveno-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=4444 --appName=bisq-XMR_STAGENET_arbitrator --daoActivated=false --apiPassword=apitest --apiPort=9998`
|
||||
3. `./haveno-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=5555 --appName=bisq-XMR_STAGENET_Alice --daoActivated=false --apiPassword=apitest --apiPort=9999`
|
||||
4. `./haveno-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=6666 --appName=bisq-XMR_STAGENET_Bob --daoActivated=false --apiPassword=apitest --apiPort=10000`
|
||||
14. Arbitrator window > Account > cmd+n to register a new arbitrator
|
||||
15. Arbitrator window > Account > cmd+d to register a new mediator
|
||||
16. Deposit stagenet XMR to Alice and Bob's Haveno wallets (wallet address printed to terminal)
|
||||
|
|
|
|||
26
build.gradle
26
build.gradle
|
|
@ -12,10 +12,10 @@ buildscript {
|
|||
}
|
||||
|
||||
configure(rootProject) {
|
||||
// remove the 'bisq-*' scripts and 'lib' dir generated by the 'installDist' task
|
||||
// remove the 'haveno-*' scripts and 'lib' dir generated by the 'installDist' task
|
||||
task clean {
|
||||
doLast {
|
||||
delete fileTree(dir: rootProject.projectDir, include: 'bisq-*'), 'lib'
|
||||
delete fileTree(dir: rootProject.projectDir, include: 'haveno-*'), 'lib'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -111,14 +111,14 @@ configure([project(':cli'),
|
|||
installDist.destinationDir = file('build/app')
|
||||
distZip.enabled = false
|
||||
|
||||
// the 'installDist' and 'startScripts' blocks below configure bisq executables to put
|
||||
// the 'installDist' and 'startScripts' blocks below configure haveno executables to put
|
||||
// generated shell scripts in the root project directory, such that users can easily
|
||||
// discover and invoke e.g. ./bisq-desktop, ./bisq-seednode, etc.
|
||||
// discover and invoke e.g. ./haveno-desktop, ./haveno-seednode, etc.
|
||||
// See https://stackoverflow.com/q/46327736 for details.
|
||||
|
||||
installDist {
|
||||
doLast {
|
||||
// copy generated shell scripts, e.g. `bisq-desktop` directly to the project
|
||||
// copy generated shell scripts, e.g. `haveno-desktop` directly to the project
|
||||
// root directory for discoverability and ease of use
|
||||
|
||||
copy {
|
||||
|
|
@ -134,16 +134,16 @@ configure([project(':cli'),
|
|||
|
||||
// edit generated shell scripts such that they expect to be executed in the
|
||||
// project root dir as opposed to a 'bin' subdirectory
|
||||
def windowsScriptFile = file("${rootProject.projectDir}/bisq-${applicationName}.bat")
|
||||
def windowsScriptFile = file("${rootProject.projectDir}/haveno-${applicationName}.bat")
|
||||
windowsScriptFile.text = windowsScriptFile.text.replace(
|
||||
'set APP_HOME=%DIRNAME%..', 'set APP_HOME=%DIRNAME%')
|
||||
|
||||
def unixScriptFile = file("${rootProject.projectDir}/bisq-$applicationName")
|
||||
def unixScriptFile = file("${rootProject.projectDir}/haveno-$applicationName")
|
||||
unixScriptFile.text = unixScriptFile.text.replace(
|
||||
'cd "`dirname \\"$PRG\\"`/.." >/dev/null', 'cd "`dirname \\"$PRG\\"`" >/dev/null')
|
||||
|
||||
if (applicationName == 'desktop') {
|
||||
def script = file("${rootProject.projectDir}/bisq-$applicationName")
|
||||
def script = file("${rootProject.projectDir}/haveno-$applicationName")
|
||||
script.text = script.text.replace(
|
||||
'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=4g"')
|
||||
}
|
||||
|
|
@ -152,22 +152,22 @@ configure([project(':cli'),
|
|||
// Pass the logback config file as a system property to avoid chatty
|
||||
// logback startup due to multiple logback.xml files in the classpath
|
||||
// (:daemon & :cli).
|
||||
def script = file("${rootProject.projectDir}/bisq-$applicationName")
|
||||
def script = file("${rootProject.projectDir}/haveno-$applicationName")
|
||||
script.text = script.text.replace(
|
||||
'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="' +
|
||||
'-Dlogback.configurationFile=apitest/build/resources/main/logback.xml"')
|
||||
}
|
||||
|
||||
if (osdetector.os != 'windows')
|
||||
delete fileTree(dir: rootProject.projectDir, include: 'bisq-*.bat')
|
||||
delete fileTree(dir: rootProject.projectDir, include: 'haveno-*.bat')
|
||||
else
|
||||
delete fileTree(dir: rootProject.projectDir, include: 'bisq-*', exclude: '*.bat')
|
||||
delete fileTree(dir: rootProject.projectDir, include: 'haveno-*', exclude: '*.bat')
|
||||
}
|
||||
}
|
||||
|
||||
startScripts {
|
||||
// rename scripts from, e.g. `desktop` to `bisq-desktop`
|
||||
applicationName = "bisq-$applicationName"
|
||||
// rename scripts from, e.g. `desktop` to `haveno-desktop`
|
||||
applicationName = "haveno-$applicationName"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue