AaronFiore/electrum
1
0
Fork 0
Code Activity

windows build: skip building pyinstaller if already there

Browse Source
This commit is contained in:
SomberNight
2021-03-08 03:03:31 +01:00
parent 41233a4bc7
commit cf5bf5d1af
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,6 +100,17 @@ info "Building PyInstaller."
# we build our own PyInstaller boot loader as the default one has high # we build our own PyInstaller boot loader as the default one has high
# anti-virus false positives # anti-virus false positives
( (
if [ "$WIN_ARCH" = "win32" ] ; then
PYINST_ARCH="32bit"
elif [ "$WIN_ARCH" = "win64" ] ; then
PYINST_ARCH="64bit"
else
fail "unexpected WIN_ARCH: $WIN_ARCH"
fi
if [ -f "$CACHEDIR/pyinstaller/PyInstaller/bootloader/Windows-$PYINST_ARCH/runw.exe" ]; then
info "pyinstaller already built, skipping"
exit 0
fi
cd "$WINEPREFIX/drive_c/electrum" cd "$WINEPREFIX/drive_c/electrum"
ELECTRUM_COMMIT_HASH=$(git rev-parse HEAD) ELECTRUM_COMMIT_HASH=$(git rev-parse HEAD)
cd "$CACHEDIR" cd "$CACHEDIR"
@@ -126,13 +137,7 @@ info "Building PyInstaller."
-Wno-error=stringop-truncation" -Wno-error=stringop-truncation"
popd popd
# sanity check bootloader is there: # sanity check bootloader is there:
if [ "$WIN_ARCH" = "win32" ] ; then [[ -e "PyInstaller/bootloader/Windows-$PYINST_ARCH/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! (32bit)"
elif [ "$WIN_ARCH" = "win64" ] ; then
[[ -e PyInstaller/bootloader/Windows-64bit/runw.exe ]] || fail "Could not find runw.exe in target dir! (64bit)"
else
fail "unexpected WIN_ARCH: $WIN_ARCH"
fi
) || fail "PyInstaller build failed" ) || fail "PyInstaller build failed"
info "Installing PyInstaller." info "Installing PyInstaller."
$WINE_PYTHON -m pip install --no-dependencies --no-warn-script-location ./pyinstaller $WINE_PYTHON -m pip install --no-dependencies --no-warn-script-location ./pyinstaller