From f97e81252d35b0e12b2e5e361e9733f0d08eb2eb Mon Sep 17 00:00:00 2001 From: ThomasV Date: Mon, 13 Nov 2017 14:22:37 +0100 Subject: [PATCH] windows builds: download icons_rc.py from dedicated repo, because pyrcc5 is not deterministic --- contrib/build-wine/build-electrum-git.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index fbe2c10e..44756261 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -2,6 +2,7 @@ # You probably need to update only this link ELECTRUM_GIT_URL=https://github.com/spesmilo/electrum.git +ELECTRUM_ICONS_URL=https://github.com/spesmilo/electrum-icons.git BRANCH=master NAME_ROOT=electrum PYTHON_VERSION=3.5.4 @@ -52,8 +53,19 @@ cp electrum-git/LICENCE . cp -r ../../../lib/locale $WINEPREFIX/drive_c/electrum/lib/ # Build Qt resources -wine $WINEPREFIX/drive_c/python$PYTHON_VERSION/Scripts/pyrcc5.exe C:/electrum/icons.qrc -o C:/electrum/gui/qt/icons_rc.py - +# wine $WINEPREFIX/drive_c/python$PYTHON_VERSION/Scripts/pyrcc5.exe C:/electrum/icons.qrc -o C:/electrum/gui/qt/icons_rc.py +# fetch icons file +if [ -d "electrum-icons" ]; then + echo "Pull" + cd electrum-icons + git pull + git checkout master + cd .. +else + echo "Clone" + git clone -b master $ELECTRUM_ICONS_URL electrum-icons +fi +cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrum/gui/qt/ pushd $WINEPREFIX/drive_c/electrum $PYTHON setup.py install