cleanup macOS build

This commit is contained in:
Aditya Kulkarni 2018-11-18 21:43:24 -08:00
parent c7788b1889
commit de49af4945
3 changed files with 23 additions and 10 deletions

View File

@ -2,9 +2,12 @@
"title": "zec-qt-wallet", "title": "zec-qt-wallet",
"icon": "logo.icns", "icon": "logo.icns",
"background": "dmgbg.png", "background": "dmgbg.png",
"window" : { "size" : { "width" : 600, "height" : 100}}, "window" : {
"size" : { "width" : 600, "height" : 100},
"position" : { "x" : 200, "y" : 200}
},
"contents": [ "contents": [
{ "x": 448, "y": 60, "type": "link", "path": "/Applications" }, { "x": 448, "y": 80, "type": "link", "path": "/Applications" },
{ "x": 192, "y": 60, "type": "file", "path": "../zec-qt-wallet.app" } { "x": 152, "y": 80, "type": "file", "path": "../zec-qt-wallet.app" }
] ]
} }

View File

@ -110,9 +110,6 @@ private:
// Current balance in the UI. If this number updates, then refresh the UI // Current balance in the UI. If this number updates, then refresh the UI
QString currentBalance; QString currentBalance;
// First time warning flag for no connection
bool firstTime = true;
}; };
#endif // RPCCLIENT_H #endif // RPCCLIENT_H

View File

@ -16,20 +16,33 @@ if [ ! -f ../zcash/src/zcashd ]; then
fi fi
#Clean #Clean
echo -n "Cleaning............"
make distclean >/dev/null 2>&1 make distclean >/dev/null 2>&1
rm artifacts/zec-qt-wallet-v$APP_VERSION.dmg rm -f artifacts/zec-qt-wallet-v$APP_VERSION.dmg
echo "[OK]"
echo -n "Building............"
# Build # Build
$QT_PATH/bin/qmake zec-qt-wallet.pro CONFIG+=release $QT_PATH/bin/qmake zec-qt-wallet.pro CONFIG+=release >/dev/null
make -j4 >/dev/null make -j4 >/dev/null
echo "[OK]"
#Qt deploy #Qt deploy
echo -n "Deploying..........."
mkdir artifacts >/dev/null 2>&1 mkdir artifacts >/dev/null 2>&1
rm -f artifcats/zec-qt-wallet.dmg >/dev/null 2>&1 rm -f artifcats/zec-qt-wallet.dmg >/dev/null 2>&1
rm -f artifacts/rw* >/dev/null 2>&1 rm -f artifacts/rw* >/dev/null 2>&1
cp ../zcash/src/zcashd zec-qt-wallet.app/Contents/MacOS/ cp ../zcash/src/zcashd zec-qt-wallet.app/Contents/MacOS/
$QT_PATH/bin/macdeployqt zec-qt-wallet.app $QT_PATH/bin/macdeployqt zec-qt-wallet.app
echo "[OK]"
echo -n "Building dmg........"
# create-dmg --volname "zec-qt-wallet-v$APP_VERSION" --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 --hdiutil-quiet --background res/dmgbg.png artifacts/zec-qt-wallet.dmg zec-qt-wallet.app >/dev/null # create-dmg --volname "zec-qt-wallet-v$APP_VERSION" --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 --hdiutil-quiet --background res/dmgbg.png artifacts/zec-qt-wallet.dmg zec-qt-wallet.app >/dev/null
appdmg --quiet res/appdmg.json artifacts/zec-qt-wallet-v$APP_VERSION.dmg >/dev/null
appdmg res/appdmg.json artifacts/zec-qt-wallet-v$APP_VERSION.dmg if [ ! -f artifacts/zec-qt-wallet-v$APP_VERSION.dmg ]; then
echo "[ERROR]"
exit 1
fi
echo "[OK]"