windows builds: pass name to pyinstaller (try to fix issue #1000)
This commit is contained in:
parent
1899f1f0df
commit
60b300d6ed
|
@ -57,17 +57,14 @@ cd ..
|
||||||
rm -rf dist/
|
rm -rf dist/
|
||||||
|
|
||||||
# build standalone version
|
# 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
|
# build NSIS installer
|
||||||
# $VERSION could be passed to the electrum.nsi script, but this would require some rewriting in the script iself.
|
# $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
|
wine "$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe" /DPRODUCT_VERSION=$VERSION electrum.nsi
|
||||||
|
|
||||||
cd dist
|
cd dist
|
||||||
mv electrum.exe $NAME_ROOT-$VERSION.exe
|
|
||||||
mv electrum-setup.exe $NAME_ROOT-$VERSION-setup.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 ..
|
cd ..
|
||||||
|
|
||||||
# build portable version
|
# build portable version
|
||||||
|
@ -75,9 +72,6 @@ cp portable.patch $WINEPREFIX/drive_c/electrum
|
||||||
pushd $WINEPREFIX/drive_c/electrum
|
pushd $WINEPREFIX/drive_c/electrum
|
||||||
patch < portable.patch
|
patch < portable.patch
|
||||||
popd
|
popd
|
||||||
$PYTHON "C:/pyinstaller/pyinstaller.py" --noconfirm --ascii -w deterministic.spec
|
$PYTHON "C:/pyinstaller/pyinstaller.py" --noconfirm --ascii --name $NAME_ROOT-$VERSION-portable.exe -w deterministic.spec
|
||||||
cd dist
|
|
||||||
mv electrum.exe $NAME_ROOT-$VERSION-portable.exe
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
echo "Done."
|
echo "Done."
|
||||||
|
|
|
@ -1,5 +1,14 @@
|
||||||
# -*- mode: python -*-
|
# -*- 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\\'
|
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
|
# 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.scripts,
|
||||||
a.binaries,
|
a.binaries,
|
||||||
a.datas,
|
a.datas,
|
||||||
name=os.path.join('build\\pyi.win32\\electrum', 'electrum.exe'),
|
name=os.path.join('build\\pyi.win32\\electrum', cmdline_name),
|
||||||
debug=False,
|
debug=False,
|
||||||
strip=None,
|
strip=None,
|
||||||
upx=False,
|
upx=False,
|
||||||
|
|
Loading…
Reference in New Issue