Skip to content
This repository has been archived by the owner on Sep 26, 2023. It is now read-only.

Commit

Permalink
mingw compiler fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
adityapk00 committed Nov 19, 2019
1 parent 363d02c commit 657efc9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ MainWindow::MainWindow(QWidget *parent) :
QObject::connect(ui->actionRescan, &QAction::triggered, [=]() {
// To rescan, we clear the wallet state, and then reload the connection
// This will start a sync, and show the scanning status.
getRPC()->clearWallet([=] (auto) {
this->getRPC()->clearWallet([=] (auto) {
// Save the wallet
getRPC()->saveWallet([=] (auto) {
this->getRPC()->saveWallet([=] (auto) {
// Then reload the connection. The ConnectionLoader deletes itself.
auto cl = new ConnectionLoader(this, rpc);
cl->loadConnection();
Expand Down
12 changes: 10 additions & 2 deletions src/scripts/mkmacdmg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ export PATH=$PATH:/usr/local/bin
#Clean
echo -n "Cleaning..............."
make distclean >/dev/null 2>&1
rm -f artifacts/macOS-zecwallet-v$APP_VERSION.dmg
rm -f artifacts/macOS-zecwallet-v$APP_VERSION.dmg
rm -rf Zecwallet-Lite.app/ zecwallet-lite.app/
echo "[OK]"


Expand All @@ -76,10 +77,17 @@ mkdir artifacts >/dev/null 2>&1
rm -f artifcats/zecwallet-lite.dmg >/dev/null 2>&1
rm -f artifacts/rw* >/dev/null 2>&1
$QT_PATH/bin/macdeployqt zecwallet-lite.app
codesign --deep --force --verify --verbose -s "$CERTIFICATE" --options runtime --timestamp Zecwallet-Lite.app/
codesign --deep --force --verify --verbose -s "$CERTIFICATE" --options runtime --timestamp zecwallet-lite.app/
echo "[OK]"


# Code Signing Note:
# On MacOS, you still need to run these 3 commands:
# xcrun altool --notarize-app -t osx -f macOS-zecwallet-lite-v1.0.0.dmg --primary-bundle-id="com.yourcompany.zecwallet-lite" -u "apple developer [email protected]" -p "one time password"
# xcrun altool --notarization-info <output from pervious command> -u "apple developer [email protected]" -p "one time password"
#...wait for the notarization to finish...
# xcrun stapler staple macOS-zecwallet-lite-v1.0.0.dmg

echo -n "Building dmg..........."
mv zecwallet-lite.app Zecwallet-Lite.app
create-dmg --volname "Zecwallet-Lite-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "Zecwallet-Lite.app" 200 190 --app-drop-link 600 185 --hide-extension "Zecwallet-Lite.app" --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png artifacts/macOS-zecwallet-lite-v$APP_VERSION.dmg Zecwallet-Lite.app >/dev/null 2>&1
Expand Down

0 comments on commit 657efc9

Please sign in to comment.