Browse Source

win/mac build: bump pyinstaller (5.13.2->6.6.0)

master
SomberNight 2 years ago
parent
commit
d46e724816
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 2
      contrib/build-wine/build-electrum-git.sh
  2. 4
      contrib/build-wine/prepare-wine.sh
  3. 6
      contrib/osx/make_osx.sh

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

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

4
contrib/build-wine/prepare-wine.sh

@ -1,8 +1,8 @@
#!/bin/bash
PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
PYINSTALLER_COMMIT="d1b6b520a017578a19e1cb9514752a4517755ee0"
# ^ tag "v5.13.2"
PYINSTALLER_COMMIT="5d7a0449ecea400eccbbb30d5fcef27d72f8f75d"
# ^ tag "v6.6.0"
PYTHON_VERSION=3.11.9

6
contrib/osx/make_osx.sh

@ -88,8 +88,8 @@ brew install autoconf automake libtool gettext coreutils pkgconfig
info "Building PyInstaller."
PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
PYINSTALLER_COMMIT="d1b6b520a017578a19e1cb9514752a4517755ee0"
# ^ tag "v5.13.2"
PYINSTALLER_COMMIT="5d7a0449ecea400eccbbb30d5fcef27d72f8f75d"
# ^ tag "v6.6.0"
(
if [ -f "$CACHEDIR/pyinstaller/PyInstaller/bootloader/Darwin-64bit/runw" ]; then
info "pyinstaller already built, skipping"
@ -204,7 +204,7 @@ find . -exec touch -t '200101220000' {} + || true
VERSION=$(git describe --tags --dirty --always)
info "Building binary"
ELECTRUM_VERSION=$VERSION pyinstaller --noconfirm --ascii --clean contrib/osx/osx.spec || fail "Could not build binary"
ELECTRUM_VERSION=$VERSION pyinstaller --noconfirm --clean contrib/osx/osx.spec || fail "Could not build binary"
info "Finished building unsigned dist/${PACKAGE}.app. This hash should be reproducible:"
find "dist/${PACKAGE}.app" -type f -print0 | sort -z | xargs -0 shasum -a 256 | shasum -a 256

Loading…
Cancel
Save