Browse Source

mac build: bump pyinstaller (4.2 -> 5.3)

master
SomberNight 3 years ago
parent
commit
a143d05fb9
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 3
      contrib/osx/README.md
  2. 5
      contrib/osx/make_osx
  3. 1
      contrib/osx/osx.spec

3
contrib/osx/README.md

@ -11,6 +11,9 @@ This guide explains how to build Electrum binaries for macOS systems.
This needs to be done on a system running macOS or OS X. This needs to be done on a system running macOS or OS X.
The script is only tested on Intel-based Macs, and the binary built
targets `x86_64` currently.
Notes about compatibility with different macOS versions: Notes about compatibility with different macOS versions:
- In general the binary is not guaranteed to run on an older version of macOS - In general the binary is not guaranteed to run on an older version of macOS
than what the build machine has. This is due to bundling the compiled Python into than what the build machine has. This is due to bundling the compiled Python into

5
contrib/osx/make_osx

@ -108,8 +108,8 @@ brew install autoconf automake libtool gettext coreutils pkgconfig
info "Building PyInstaller." info "Building PyInstaller."
PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git" PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
PYINSTALLER_COMMIT="40c9abce2d8de879e414fd377c933dccaab1e156" PYINSTALLER_COMMIT="fbf7948be85177dd44b41217e9f039e1d176de6b"
# ^ tag "4.2" # ^ tag "5.3"
# TODO test newer versions of pyinstaller for build-reproducibility. # TODO test newer versions of pyinstaller for build-reproducibility.
# we are using this version for now due to change in code-signing behaviour # we are using this version for now due to change in code-signing behaviour
# (https://github.com/pyinstaller/pyinstaller/pull/5581) # (https://github.com/pyinstaller/pyinstaller/pull/5581)
@ -139,7 +139,6 @@ PYINSTALLER_COMMIT="40c9abce2d8de879e414fd377c933dccaab1e156"
popd popd
# sanity check bootloader is there: # sanity check bootloader is there:
[[ -e "PyInstaller/bootloader/Darwin-64bit/runw" ]] || fail "Could not find runw in target dir!" [[ -e "PyInstaller/bootloader/Darwin-64bit/runw" ]] || fail "Could not find runw in target dir!"
rm pyinstaller.py # workaround for https://github.com/pyinstaller/pyinstaller/pull/6701
) || fail "PyInstaller build failed" ) || fail "PyInstaller build failed"
info "Installing PyInstaller." info "Installing PyInstaller."
python3 -m pip install --no-build-isolation --no-dependencies --no-warn-script-location "$CACHEDIR/pyinstaller" python3 -m pip install --no-build-isolation --no-dependencies --no-warn-script-location "$CACHEDIR/pyinstaller"

1
contrib/osx/osx.spec

@ -107,6 +107,7 @@ exe = EXE(
upx=True, upx=True,
icon=electrum+ICONS_FILE, icon=electrum+ICONS_FILE,
console=False, console=False,
target_arch='x86_64', # TODO investigate building 'universal2'
) )
app = BUNDLE( app = BUNDLE(

Loading…
Cancel
Save