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/osx/make_osx
View File

@@ -217,7 +217,7 @@ find . -exec touch -t '200101220000' {} + || true
VERSION=`git describe --tags --dirty --always`
info "Building binary"
pyinstaller --noconfirm --ascii --clean --name $VERSION contrib/osx/osx.spec || fail "Could not build binary"
ELECTRUM_VERSION=$VERSION pyinstaller --noconfirm --ascii --clean contrib/osx/osx.spec || fail "Could not build binary"
DoCodeSignMaybe "app bundle" "dist/${PACKAGE}.app"

7
contrib/osx/osx.spec
View File

@@ -10,11 +10,8 @@ MAIN_SCRIPT='run_electrum'
ICONS_FILE=PYPKG + '/gui/icons/electrum.icns'
for i, x in enumerate(sys.argv):
if x == '--name':
VERSION = sys.argv[i+1]
break
else:
VERSION = os.environ.get("ELECTRUM_VERSION")
if not VERSION:
raise Exception('no version')
electrum = os.path.abspath(".") + "/"