From 0a8b3f61b3ca2311afc3df084752c99647eca7d8 Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <adityapk@gmail.com>
Date: Tue, 30 Oct 2018 16:25:29 -0700
Subject: [PATCH] Unify cross-compiled windows build

---
 src/qrcodelabel.cpp      |  2 +-
 src/scripts/mkmingw.sh   | 42 ------------------------------
 src/scripts/mkrelease.sh | 56 +++++++++++++++++++++++++++++++++++++---
 3 files changed, 54 insertions(+), 46 deletions(-)
 delete mode 100755 src/scripts/mkmingw.sh

diff --git a/src/qrcodelabel.cpp b/src/qrcodelabel.cpp
index a556cd6..97a4306 100644
--- a/src/qrcodelabel.cpp
+++ b/src/qrcodelabel.cpp
@@ -13,7 +13,7 @@ QSize QRCodeLabel::sizeHint() const
     return QSize(w, w);   // 1:1 
 }
 
-void QRCodeLabel::resizeEvent(QResizeEvent * e)
+void QRCodeLabel::resizeEvent(QResizeEvent*)
 {
     if(!address.isEmpty())
         QLabel::setPixmap(scaledPixmap());
diff --git a/src/scripts/mkmingw.sh b/src/scripts/mkmingw.sh
deleted file mode 100755
index 3f4c8fa..0000000
--- a/src/scripts/mkmingw.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi
-if [ -z $MXE_PATH ]; then echo "MXE_PATH is not set. Set it to ~/github/mxe/usr/bin"; exit 1; fi
-
-export PATH=$MXE_PATH:$PATH
-
-echo -n "Configuring..."
-make distclean  > /dev/null
-rm -f zec-qt-wallet-mingw.pro
-rm -rf release/
-#Mingw seems to have trouble with precompiled heades, so strip that option from the .pro file
-cat zec-qt-wallet.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > zec-qt-wallet-mingw.pro
-echo "[OK]"
-
-
-echo -n "Building......"
-x86_64-w64-mingw32.static-qmake-qt5 zec-qt-wallet-mingw.pro CONFIG+=release > /dev/null
-make -j32 > /dev/null
-echo "[OK]"
-
-
-echo -n "Packaging....."
-mkdir release/zec-qt-wallet-v$APP_VERSION 
-cp release/zec-qt-wallet.exe release/zec-qt-wallet-v$APP_VERSION 
-cp README.md release/zec-qt-wallet-v$APP_VERSION 
-cp LICENSE release/zec-qt-wallet-v$APP_VERSION 
-cd release && zip -r Windows-zec-qt-wallet-v$APP_VERSION.zip zec-qt-wallet-v$APP_VERSION/ > /dev/null
-cd ..
-cp release/Windows-zec-qt-wallet-v$APP_VERSION.zip .
-
-
-if [ -f Windows-zec-qt-wallet-v$APP_VERSION.zip ] ; then
-    echo "[OK]"
-
-    echo "Done. Build is Windows-zec-qt-wallet-v$APP_VERSION.zip"
-    echo "Package contents:"
-    unzip -l "Windows-zec-qt-wallet-v$APP_VERSION.zip"
-else
-    echo "[ERROR]"
-    exit 1
-fi
diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh
index 25c1e96..69be80c 100755
--- a/src/scripts/mkrelease.sh
+++ b/src/scripts/mkrelease.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-if [ -z $QT_STATIC ]; then echo "QT_STATIC is not set"; exit 1; fi
+if [ -z $QT_STATIC ]; then 
+    echo "QT_STATIC is not set. Please set it to the base directory of a statically compiled Qt"; 
+    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
 
@@ -12,11 +17,17 @@ sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zec-qt-wallet.pro > /dev/null
 sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" README.md > /dev/null
 echo "[OK]"
 
+echo -n "Cleaning......"
+rm -f bin/linux-zec-qt-wallet*
+rm -rf release/
+make distclean > /dev/null
+echo "[OK]"
+
+echo "Linux"
 
 echo -n "Configuring..."
-rm -f bin/linux-zec-qt-wallet*
-make distclean > /dev/null
 $QT_STATIC/bin/qmake zec-qt-wallet.pro -spec linux-clang CONFIG+=release > /dev/null
+#Mingw seems to have trouble with precompiled heades, so strip that option from the .pro file
 echo "[OK]"
 
 
@@ -55,3 +66,42 @@ else
     exit 1
 fi
 
+echo "Windows"
+
+export PATH=$MXE_PATH:$PATH
+
+echo -n "Configuring..."
+make clean  > /dev/null
+rm -f zec-qt-wallet-mingw.pro
+rm -rf release/
+#Mingw seems to have trouble with precompiled heades, so strip that option from the .pro file
+cat zec-qt-wallet.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > zec-qt-wallet-mingw.pro
+echo "[OK]"
+
+
+echo -n "Building......"
+x86_64-w64-mingw32.static-qmake-qt5 zec-qt-wallet-mingw.pro CONFIG+=release > /dev/null
+make -j32 > /dev/null
+echo "[OK]"
+
+
+echo -n "Packaging....."
+mkdir release/zec-qt-wallet-v$APP_VERSION 
+cp release/zec-qt-wallet.exe release/zec-qt-wallet-v$APP_VERSION 
+cp README.md release/zec-qt-wallet-v$APP_VERSION 
+cp LICENSE release/zec-qt-wallet-v$APP_VERSION 
+cd release && zip -r Windows-zec-qt-wallet-v$APP_VERSION.zip zec-qt-wallet-v$APP_VERSION/ > /dev/null
+cd ..
+cp release/Windows-zec-qt-wallet-v$APP_VERSION.zip .
+
+
+if [ -f Windows-zec-qt-wallet-v$APP_VERSION.zip ] ; then
+    echo "[OK]"
+
+    echo "Done. Build is Windows-zec-qt-wallet-v$APP_VERSION.zip"
+    echo "Package contents:"
+    unzip -l "Windows-zec-qt-wallet-v$APP_VERSION.zip"
+else
+    echo "[ERROR]"
+    exit 1
+fi