diff --git a/src/rpc.cpp b/src/rpc.cpp index 9fc4413..7ff0ba6 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -554,7 +554,6 @@ void RPC::getInfoThenRefresh(bool force) { // Update zcashd tab if it exists if (ezcashd) { if (isSyncing) { - const qint64 genisisTimeMSec = 1477638000000; QString txt = QString::number(blockNumber); if (estimatedheight > 0) { txt = txt % " / ~" % QString::number(estimatedheight); diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh index 66e9b3c..376cc7d 100755 --- a/src/scripts/mkrelease.sh +++ b/src/scripts/mkrelease.sh @@ -5,7 +5,6 @@ if [ -z $QT_STATIC ]; then exit 1; fi -if [ -z $MXE_PATH ]; then echo "MXE_PATH is not set. Set it to ~/github/mxe/usr/bin"; exit 1; fi if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi @@ -20,18 +19,6 @@ if [ ! -f ../zcash/artifacts/zcash-cli ]; then exit 1; fi - -if [ ! -f ../zcash/artifacts/zcashd.exe ]; then - echo "Couldn't find zcashd.exe in ../zcash/artifacts/. Please build zcashd.exe" - exit 1; -fi - - -if [ ! -f ../zcash/artifacts/zcash-cli.exe ]; then - echo "Couldn't find zcash-cli.exe in ../zcash/artifacts/. Please build zcashd.exe" - exit 1; -fi - echo -n "Version files....." # Replace the version number in the .pro file so it gets picked up everywhere sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zec-qt-wallet.pro > /dev/null @@ -99,8 +86,28 @@ else exit 1 fi + + echo "" echo "[Windows]" + +if [ -z $MXE_PATH ]; then + echo "MXE_PATH is not set. Set it to ~/github/mxe/usr/bin if you want to build Windows" + echo "Not building Windows" + exit 1; +fi + +if [ ! -f ../zcash/artifacts/zcashd.exe ]; then + echo "Couldn't find zcashd.exe in ../zcash/artifacts/. Please build zcashd.exe" + exit 1; +fi + + +if [ ! -f ../zcash/artifacts/zcash-cli.exe ]; then + echo "Couldn't find zcash-cli.exe in ../zcash/artifacts/. Please build zcashd.exe" + exit 1; +fi + export PATH=$MXE_PATH:$PATH echo -n "Configuring......."