Switch to appdmg for macOS
This commit is contained in:
parent
769c44d11e
commit
c7788b1889
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"title": "zec-qt-wallet",
|
||||
"icon": "logo.icns",
|
||||
"background": "dmgbg.png",
|
||||
"window" : { "size" : { "width" : 600, "height" : 100}},
|
||||
"contents": [
|
||||
{ "x": 448, "y": 60, "type": "link", "path": "/Applications" },
|
||||
{ "x": 192, "y": 60, "type": "file", "path": "../zec-qt-wallet.app" }
|
||||
]
|
||||
}
|
|
@ -56,8 +56,8 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) {
|
|||
} else {
|
||||
// We tried to start ezcashd previously, and it didn't work. So, show the error.
|
||||
QString explanation = QString() % "Couldn't start the embedded zcashd.\n\n" %
|
||||
"Please try restarting.\n\nIfIf you previously started zcashd with custom arguments, you might need to reset zcash.conf.\n\n"
|
||||
"If all else fails, please run zcashd manually."
|
||||
"Please try restarting.\n\nIfIf you previously started zcashd with custom arguments, you might need to reset zcash.conf.\n\n" %
|
||||
"If all else fails, please run zcashd manually." %
|
||||
(ezcashd ? "The process returned:\n\n" % ezcashd->errorString() : QString(""));
|
||||
this->showError(explanation);
|
||||
}
|
||||
|
|
|
@ -17,6 +17,7 @@ fi
|
|||
|
||||
#Clean
|
||||
make distclean >/dev/null 2>&1
|
||||
rm artifacts/zec-qt-wallet-v$APP_VERSION.dmg
|
||||
|
||||
# Build
|
||||
$QT_PATH/bin/qmake zec-qt-wallet.pro CONFIG+=release
|
||||
|
@ -29,7 +30,6 @@ rm -f artifacts/rw* >/dev/null 2>&1
|
|||
cp ../zcash/src/zcashd zec-qt-wallet.app/Contents/MacOS/
|
||||
$QT_PATH/bin/macdeployqt zec-qt-wallet.app
|
||||
|
||||
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
|
||||
|
||||
mv artifacts/zec-qt-wallet.dmg artifacts/MacOS-zec-qt-wallet-v$APP_VERSION.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
|
||||
|
||||
appdmg res/appdmg.json artifacts/zec-qt-wallet-v$APP_VERSION.dmg
|
||||
|
|
Loading…
Reference in New Issue