From ff777946fe189a456a79f43f2eb8c93870db92fb Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 6 Jun 2025 14:21:05 +0000 Subject: [PATCH] build: win/mac: rename pyinstaller spec files for clarity also, "deterministic.spec" is a confusing name --- contrib/build-wine/build-electrum-git.sh | 2 +- contrib/build-wine/{deterministic.spec => pyinstaller.spec} | 0 contrib/osx/make_osx.sh | 2 +- contrib/osx/{osx.spec => pyinstaller.spec} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename contrib/build-wine/{deterministic.spec => pyinstaller.spec} (100%) rename contrib/osx/{osx.spec => pyinstaller.spec} (100%) diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index 70dff7381..10c1ac1c6 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -62,7 +62,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 --clean deterministic.spec +ELECTRUM_CMDLINE_NAME="$NAME_ROOT-$VERSION" wine "$WINE_PYHOME/scripts/pyinstaller.exe" --noconfirm --clean pyinstaller.spec # set timestamps in dist, in order to make the installer reproducible pushd dist diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/pyinstaller.spec similarity index 100% rename from contrib/build-wine/deterministic.spec rename to contrib/build-wine/pyinstaller.spec diff --git a/contrib/osx/make_osx.sh b/contrib/osx/make_osx.sh index 2fa3557bc..b6cf47625 100755 --- a/contrib/osx/make_osx.sh +++ b/contrib/osx/make_osx.sh @@ -211,7 +211,7 @@ find . -exec touch -t '200101220000' {} + || true VERSION=$(git describe --tags --dirty --always) info "Building binary" -ELECTRUM_VERSION=$VERSION pyinstaller --noconfirm --clean contrib/osx/osx.spec || fail "Could not build binary" +ELECTRUM_VERSION=$VERSION pyinstaller --noconfirm --clean contrib/osx/pyinstaller.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 diff --git a/contrib/osx/osx.spec b/contrib/osx/pyinstaller.spec similarity index 100% rename from contrib/osx/osx.spec rename to contrib/osx/pyinstaller.spec