diff --git a/.gitignore b/.gitignore index ae1206b..127365b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ src/ui_*.h src/precompiled.h.cpp .qmake.stash zec-qt-wallet +zec-qt-wallet.app zec-qt-wallet-mingw* zec-qt-wallet.vcxproj* zec-qt-wallet.sln @@ -20,4 +21,4 @@ zec-qt-wallet_plugin_import.cpp zec-qt-wallet_resource* workspace.code-workspace *.zip -*.tar.gz \ No newline at end of file +*.tar.gz diff --git a/res/logo.icns b/res/logo.icns new file mode 100644 index 0000000..504e7d1 Binary files /dev/null and b/res/logo.icns differ diff --git a/src/connection.cpp b/src/connection.cpp index 68aef68..a8aacb2 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -107,6 +107,7 @@ void ConnectionLoader::createZcashConf() { QTextStream out(&file); out << "server=1\n"; + out << "addnode=mainnet.z.cash\n"; out << "rpcuser=zec-qt-wallet\n"; out << "rpcpassword=" % randomPassword() << "\n"; file.close(); diff --git a/src/scripts/mkmacdmg.sh b/src/scripts/mkmacdmg.sh new file mode 100755 index 0000000..bd0d7a9 --- /dev/null +++ b/src/scripts/mkmacdmg.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +if [ -z $QT_PATH ]; then + echo "QT_PATH is not set. Please set it to the base directory of Qt"; + exit 1; +fi + +if [ -z $APP_VERSION ]; then + echo "APP_VERSION is not set. Please set it to the current release version of the app"; + exit 1; +fi + +#Clean +make distclean 2>&1 >/dev/null + +# Build +$QT_PATH/bin/qmake zec-qt-wallet.pro CONFIG+=release +make -j4 >/dev/null + +#Qt deploy +mkdir artifacts +rm -f artifcats/zec-qt-wallet.dmg +rm -f artifacts/rw* +$QT_PATH/bin/macdeployqt zec-qt-wallet.app + +create-dmg --volname "zec-qt-wallet-v0.3.0" --volicon "res/logo.icns" --window-pos 200 120 --icon "zec-qt-wallet.app" 200 190 --app-drop-link 600 185 --hide-extension "zec-qt-wallet.app" --window-size 800 400 artifacts/zec-qt-wallet.dmg zec-qt-wallet.app + +mv artifacts/zec-qt-wallet.dmg artifacts/MacOS-zec-qt-wallet-v$APP_VERSION.dmg + diff --git a/zec-qt-wallet.pro b/zec-qt-wallet.pro index 5709a4b..26def94 100644 --- a/zec-qt-wallet.pro +++ b/zec-qt-wallet.pro @@ -87,6 +87,7 @@ FORMS += \ src/addressbook.ui win32: RC_ICONS = res/icon.ico +ICON = res/logo.icns # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin