Browse Source
windows binaries: update pyinstaller to 4.0
patch-4
SomberNight
4 years ago
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
3 changed files with
6 additions and
5 deletions
-
contrib/build-wine/prepare-wine.sh
-
contrib/requirements/requirements-mac-build.txt
-
contrib/requirements/requirements-wine-build.txt
|
|
@ -14,8 +14,8 @@ LIBUSB_COMMIT="e782eeb2514266f6738e242cdcb18e3ae1ed06fa" |
|
|
|
# ^ tag v1.0.23 |
|
|
|
|
|
|
|
PYINSTALLER_REPO="https://github.com/SomberNight/pyinstaller.git" |
|
|
|
PYINSTALLER_COMMIT="e934539374e30d1500fcdbe8e4eb0860413935b2" |
|
|
|
# ^ tag 3.6, plus a custom commit that fixes cross-compilation with MinGW |
|
|
|
PYINSTALLER_COMMIT="6e455b2c1208465742484436009bfb1e1baf2e01" |
|
|
|
# ^ tag 4.0, plus a custom commit that fixes cross-compilation with MinGW |
|
|
|
|
|
|
|
PYTHON_VERSION=3.7.9 |
|
|
|
|
|
|
@ -126,7 +126,7 @@ info "Building PyInstaller." |
|
|
|
echo "const char *electrum_tag = \"tagged by Electrum@$ELECTRUM_COMMIT_HASH\";" >> ./bootloader/src/pyi_main.c |
|
|
|
pushd bootloader |
|
|
|
# cross-compile to Windows using host python |
|
|
|
python3 ./waf all CC=i686-w64-mingw32-gcc CFLAGS="-static -Wno-dangling-else -Wno-error=unused-value" |
|
|
|
python3 ./waf all CC=i686-w64-mingw32-gcc CFLAGS="-static -Wno-dangling-else -Wno-error=unused-value -Wno-error=implicit-function-declaration" |
|
|
|
popd |
|
|
|
# sanity check bootloader is there: |
|
|
|
[[ -e PyInstaller/bootloader/Windows-32bit/runw.exe ]] || fail "Could not find runw.exe in target dir!" |
|
|
|
|
|
@ -1,5 +1,5 @@ |
|
|
|
pip |
|
|
|
setuptools |
|
|
|
setuptools<50.0.0 # 50.0.0 might break pyinstaller. see https://github.com/pyinstaller/pyinstaller/commit/e9f9d79d6b23c767512156323d0a5d28c6386a57 |
|
|
|
pyinstaller>=3.6 |
|
|
|
|
|
|
|
# needed by pyinstaller: |
|
|
|
|
|
@ -1,7 +1,8 @@ |
|
|
|
pip |
|
|
|
setuptools |
|
|
|
setuptools<50.0.0 # 50.0.0 might break pyinstaller. see https://github.com/pyinstaller/pyinstaller/commit/e9f9d79d6b23c767512156323d0a5d28c6386a57 |
|
|
|
|
|
|
|
# needed by pyinstaller: |
|
|
|
pefile>=2017.8.1 |
|
|
|
altgraph |
|
|
|
pywin32-ctypes>=0.2.0 |
|
|
|
pyinstaller-hooks-contrib>=2020.6 |
|
|
|