electrum

commit 60b300d6ed7aa128776383905b217d12736364a9
parent 1899f1f0df894d858a6f481a888a35727888640b
Author: ThomasV <thomasv@electrum.org>
Date:   Thu,  9 Mar 2017 10:20:27 +0100

windows builds: pass name to pyinstaller (try to fix issue #1000)

Diffstat:
M
contrib/build-wine/build-electrum-git.sh
 | 
10
++--------
M
contrib/build-wine/deterministic.spec
 | 
11
++++++++++-

2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh
@@ -57,17 +57,14 @@ cd ..
 rm -rf dist/
 
 # build standalone version
-$PYTHON "C:/pyinstaller/pyinstaller.py" --noconfirm --ascii -w deterministic.spec
+$PYTHON "C:/pyinstaller/pyinstaller.py" --noconfirm --ascii --name $NAME_ROOT-$VERSION.exe -w deterministic.spec
 
 # build NSIS installer
 # $VERSION could be passed to the electrum.nsi script, but this would require some rewriting in the script iself.
 wine "$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe" /DPRODUCT_VERSION=$VERSION electrum.nsi
 
 cd dist
-mv electrum.exe $NAME_ROOT-$VERSION.exe
 mv electrum-setup.exe $NAME_ROOT-$VERSION-setup.exe
-mv electrum $NAME_ROOT-$VERSION
-zip -r $NAME_ROOT-$VERSION.zip $NAME_ROOT-$VERSION
 cd ..
 
 # build portable version
@@ -75,9 +72,6 @@ cp portable.patch $WINEPREFIX/drive_c/electrum
 pushd $WINEPREFIX/drive_c/electrum
 patch < portable.patch 
 popd
-$PYTHON "C:/pyinstaller/pyinstaller.py" --noconfirm --ascii -w deterministic.spec
-cd dist
-mv electrum.exe $NAME_ROOT-$VERSION-portable.exe
-cd ..
+$PYTHON "C:/pyinstaller/pyinstaller.py" --noconfirm --ascii --name $NAME_ROOT-$VERSION-portable.exe -w deterministic.spec
 
 echo "Done."
diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
@@ -1,5 +1,14 @@
 # -*- mode: python -*-
 
+import sys
+for i, x in enumerate(sys.argv):
+    if x == '--name':
+        cmdline_name = sys.argv[i+1]
+        break
+else:
+    raise BaseException('no name')
+
+
 home = 'C:\\electrum\\'
 
 # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
@@ -71,7 +80,7 @@ exe = EXE(pyz,
           a.scripts,
           a.binaries,
           a.datas,
-          name=os.path.join('build\\pyi.win32\\electrum', 'electrum.exe'),
+          name=os.path.join('build\\pyi.win32\\electrum', cmdline_name),
           debug=False,
           strip=None,
           upx=False,