nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename bisq-* executables to haveno-* (#63)

Browse Source
This commit is contained in:
Přemek Vyhnal 2021-05-11 04:12:09 +02:00 committed by GitHub
parent 3157891bbb
commit bd8f210080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -22,7 +22,7 @@ build
*.java.hsw *.java.hsw
*.~ava *.~ava
/bundles /bundles
/bisq-* /haveno-*
/lib /lib
/xchange /xchange
desktop.ini desktop.ini

24
Makefile
View File

@ -35,13 +35,13 @@
# the various Bisq seed and desktop nodes that will make up your # the various Bisq seed and desktop nodes that will make up your
# localnet: # localnet:
# #
# $ ls -1 bisq-* # $ ls -1 haveno-*
# bisq-desktop # haveno-desktop
# bisq-monitor # haveno-monitor
# bisq-pricenode # haveno-pricenode
# bisq-relay # haveno-relay
# bisq-seednode # haveno-seednode
# bisq-statsnode # haveno-statsnode
# #
# - You will see a new '.localnet' directory containing the data dirs # - You will see a new '.localnet' directory containing the data dirs
# for your regtest Bitcoin and Bisq nodes. Once you've deployed them in # for your regtest Bitcoin and Bisq nodes. Once you've deployed them in
@ -189,7 +189,7 @@ bitcoind: .localnet
-blocknotify='.localnet/bitcoind/blocknotify %s' -blocknotify='.localnet/bitcoind/blocknotify %s'
seednode: seednode/build seednode: seednode/build
./bisq-seednode \ ./haveno-seednode \
--baseCurrencyNetwork=XMR_STAGENET \ --baseCurrencyNetwork=XMR_STAGENET \
--useLocalhostForP2P=true \ --useLocalhostForP2P=true \
--useDevPrivilegeKeys=true \ --useDevPrivilegeKeys=true \
@ -202,7 +202,7 @@ seednode: seednode/build
--appName=seednode --appName=seednode
seednode2: seednode/build seednode2: seednode/build
./bisq-seednode \ ./haveno-seednode \
--baseCurrencyNetwork=XMR_STAGENET \ --baseCurrencyNetwork=XMR_STAGENET \
--useLocalhostForP2P=true \ --useLocalhostForP2P=true \
--useDevPrivilegeKeys=true \ --useDevPrivilegeKeys=true \
@ -215,7 +215,7 @@ seednode2: seednode/build
--appName=seednode2 --appName=seednode2
mediator: desktop/build mediator: desktop/build
./bisq-desktop \ ./haveno-desktop \
--baseCurrencyNetwork=XMR_STAGENET \ --baseCurrencyNetwork=XMR_STAGENET \
--useLocalhostForP2P=true \ --useLocalhostForP2P=true \
--useDevPrivilegeKeys=true \ --useDevPrivilegeKeys=true \
@ -224,7 +224,7 @@ mediator: desktop/build
--appName=Mediator --appName=Mediator
alice: setup alice: setup
./bisq-desktop \ ./haveno-desktop \
--baseCurrencyNetwork=XMR_STAGENET \ --baseCurrencyNetwork=XMR_STAGENET \
--useLocalhostForP2P=true \ --useLocalhostForP2P=true \
--useDevPrivilegeKeys=true \ --useDevPrivilegeKeys=true \
@ -239,7 +239,7 @@ alice: setup
--appName=Alice --appName=Alice
bob: setup bob: setup
./bisq-desktop \ ./haveno-desktop \
--baseCurrencyNetwork=XMR_STAGENET \ --baseCurrencyNetwork=XMR_STAGENET \
--useLocalhostForP2P=true \ --useLocalhostForP2P=true \
--useDevPrivilegeKeys=true \ --useDevPrivilegeKeys=true \

10
README.md
View File

@ -58,10 +58,10 @@ See the [FAQ in the wiki](https://github.com/haveno-dex/haveno/wiki/FAQ).
11. `cd haveno` 11. `cd haveno`
12. `./gradlew build` 12. `./gradlew build`
13. Start seed node, arbitrator, Alice, and Bob: 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` 1. `./haveno-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` 2. `./haveno-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` 3. `./haveno-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` 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 14. Arbitrator window > Account > cmd+n to register a new arbitrator
15. Arbitrator window > Account > cmd+d to register a new mediator 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) 16. Deposit stagenet XMR to Alice and Bob's Haveno wallets (wallet address printed to terminal)
@ -113,4 +113,4 @@ To bring Haveno to life, we need resources. If you have the possibility, please
![Qr code](https://raw.githubusercontent.com/haveno-dex/haveno/master/media/qrhaveno.png) ![Qr code](https://raw.githubusercontent.com/haveno-dex/haveno/master/media/qrhaveno.png)
If you are using a wallet that supports Openalias (like the 'official' CLI and GUI wallets), you can simply put `donations@haveno.network` as the "receiver" address. If you are using a wallet that supports Openalias (like the 'official' CLI and GUI wallets), you can simply put `donations@haveno.network` as the "receiver" address.

26
build.gradle
View File

@ -12,10 +12,10 @@ buildscript {
} }
configure(rootProject) { 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 { task clean {
doLast { 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') installDist.destinationDir = file('build/app')
distZip.enabled = false 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 // 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. // See https://stackoverflow.com/q/46327736 for details.
installDist { installDist {
doLast { 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 // root directory for discoverability and ease of use
copy { copy {
@ -134,16 +134,16 @@ configure([project(':cli'),
// edit generated shell scripts such that they expect to be executed in the // edit generated shell scripts such that they expect to be executed in the
// project root dir as opposed to a 'bin' subdirectory // 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( windowsScriptFile.text = windowsScriptFile.text.replace(
'set APP_HOME=%DIRNAME%..', 'set APP_HOME=%DIRNAME%') '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( unixScriptFile.text = unixScriptFile.text.replace(
'cd "`dirname \\"$PRG\\"`/.." >/dev/null', 'cd "`dirname \\"$PRG\\"`" >/dev/null') 'cd "`dirname \\"$PRG\\"`/.." >/dev/null', 'cd "`dirname \\"$PRG\\"`" >/dev/null')
if (applicationName == 'desktop') { if (applicationName == 'desktop') {
def script = file("${rootProject.projectDir}/bisq-$applicationName") def script = file("${rootProject.projectDir}/haveno-$applicationName")
script.text = script.text.replace( script.text = script.text.replace(
'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=4g"') '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 // Pass the logback config file as a system property to avoid chatty
// logback startup due to multiple logback.xml files in the classpath // logback startup due to multiple logback.xml files in the classpath
// (:daemon & :cli). // (:daemon & :cli).
def script = file("${rootProject.projectDir}/bisq-$applicationName") def script = file("${rootProject.projectDir}/haveno-$applicationName")
script.text = script.text.replace( script.text = script.text.replace(
'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="' + 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="' +
'-Dlogback.configurationFile=apitest/build/resources/main/logback.xml"') '-Dlogback.configurationFile=apitest/build/resources/main/logback.xml"')
} }
if (osdetector.os != 'windows') if (osdetector.os != 'windows')
delete fileTree(dir: rootProject.projectDir, include: 'bisq-*.bat') delete fileTree(dir: rootProject.projectDir, include: 'haveno-*.bat')
else else
delete fileTree(dir: rootProject.projectDir, include: 'bisq-*', exclude: '*.bat') delete fileTree(dir: rootProject.projectDir, include: 'haveno-*', exclude: '*.bat')
} }
} }
startScripts { startScripts {
// rename scripts from, e.g. `desktop` to `bisq-desktop` // rename scripts from, e.g. `desktop` to `haveno-desktop`
applicationName = "bisq-$applicationName" applicationName = "haveno-$applicationName"
} }
} }