AaronFiore/electrum
1
0
Fork 0
Code Activity

build win/mac: do not pass custom args to pyinstaller; use envvars

Browse Source 
custom args no longer work with pyinstaller 5.0 (see https://github.com/pyinstaller/pyinstaller/issues/6762 )

```
option(s) not allowed:
  ...
makespec options not valid when a .spec file is given
```
This commit is contained in:
SomberNight
2022-08-29 15:00:29 +00:00
parent 2d458d3b06
commit b3e869a5de
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/build-wine/build-electrum-git.sh
View File

@@ -56,7 +56,7 @@ rm -rf dist/
# build standalone and portable versions
info "Running pyinstaller..."
wine "$WINE_PYHOME/scripts/pyinstaller.exe" --noconfirm --ascii --clean --name $NAME_ROOT-$VERSION -w deterministic.spec
ELECTRUM_CMDLINE_NAME="$NAME_ROOT-$VERSION" wine "$WINE_PYHOME/scripts/pyinstaller.exe" --noconfirm --ascii --clean -w deterministic.spec
# set timestamps in dist, in order to make the installer reproducible
pushd dist

10
contrib/build-wine/deterministic.spec
View File

@@ -2,12 +2,10 @@
from PyInstaller.utils.hooks import collect_data_files, collect_submodules, collect_dynamic_libs
import sys
for i, x in enumerate(sys.argv):
if x == '--name':
cmdline_name = sys.argv[i+1]
break
else:
import sys, os
cmdline_name = os.environ.get("ELECTRUM_CMDLINE_NAME")
if not cmdline_name:
raise Exception('no name')
home = 'C:\\electrum\\'