AaronFiore/electrum
1
0
Fork 0
Code Activity

windows binaries: update pyinstaller to 4.0

Browse Source
This commit is contained in:
SomberNight
2020-09-07 18:18:58 +02:00
parent 4f46741c52
commit cb2f92f710
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/build-wine/prepare-wine.sh
View File

@@ -14,8 +14,8 @@ LIBUSB_COMMIT="e782eeb2514266f6738e242cdcb18e3ae1ed06fa"
# ^ tag v1.0.23 # ^ tag v1.0.23
PYINSTALLER_REPO="https://github.com/SomberNight/pyinstaller.git" PYINSTALLER_REPO="https://github.com/SomberNight/pyinstaller.git"
PYINSTALLER_COMMIT="e934539374e30d1500fcdbe8e4eb0860413935b2" PYINSTALLER_COMMIT="6e455b2c1208465742484436009bfb1e1baf2e01"
# ^ tag 3.6, plus a custom commit that fixes cross-compilation with MinGW # ^ tag 4.0, plus a custom commit that fixes cross-compilation with MinGW
PYTHON_VERSION=3.7.9 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 echo "const char *electrum_tag = \"tagged by Electrum@$ELECTRUM_COMMIT_HASH\";" >> ./bootloader/src/pyi_main.c
pushd bootloader pushd bootloader
# cross-compile to Windows using host python # 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 popd
# sanity check bootloader is there: # sanity check bootloader is there:
[[ -e PyInstaller/bootloader/Windows-32bit/runw.exe ]] || fail "Could not find runw.exe in target dir!" [[ -e PyInstaller/bootloader/Windows-32bit/runw.exe ]] || fail "Could not find runw.exe in target dir!"

2
contrib/requirements/requirements-mac-build.txt
View File

@@ -1,5 +1,5 @@
pip pip
setuptools setuptools<50.0.0 # 50.0.0 might break pyinstaller. see https://github.com/pyinstaller/pyinstaller/commit/e9f9d79d6b23c767512156323d0a5d28c6386a57
pyinstaller>=3.6 pyinstaller>=3.6
# needed by pyinstaller: # needed by pyinstaller:

3
contrib/requirements/requirements-wine-build.txt
View File

@@ -1,7 +1,8 @@
pip pip
setuptools setuptools<50.0.0 # 50.0.0 might break pyinstaller. see https://github.com/pyinstaller/pyinstaller/commit/e9f9d79d6b23c767512156323d0a5d28c6386a57
# needed by pyinstaller: # needed by pyinstaller:
pefile>=2017.8.1 pefile>=2017.8.1
altgraph altgraph
pywin32-ctypes>=0.2.0 pywin32-ctypes>=0.2.0
pyinstaller-hooks-contrib>=2020.6