AaronFiore/electrum
1
0
Fork 0
Code Activity

wine build: pin build dependencies

Browse Source 
"pip install pyinstaller" was "silently" grabbing unpinned dependencies
This commit is contained in:
SomberNight
2019-08-09 19:05:32 +02:00
parent d4e16001bb
commit c8e2653690
5 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ $PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-bui
pushd $WINEPREFIX/drive_c/electrum
# see https://github.com/pypa/pip/issues/2195 -- pip makes a copy of the entire directory
info "Pip installing Electrum. This might take a long time if the project folder is large."
$PYTHON -m pip install --no-warn-script-location .
$PYTHON -m pip install --no-dependencies --no-warn-script-location .
popd

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

@@ -56,8 +56,10 @@ for msifile in core dev exe lib pip tools; do
wine msiexec /i "$PYTHON_DOWNLOADS/${msifile}.msi" /qb TARGETDIR=$PYHOME
done
info "Installing build dependencies."
$PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-wine-build.txt
info "Installing dependencies specific to binaries."
# note that this also installs pinned versions of both pip and setuptools
$PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-binaries.txt
info "Installing ZBar."
@@ -107,6 +109,6 @@ info "Building PyInstaller."
[[ -e PyInstaller/bootloader/Windows-32bit/runw.exe ]] || fail "Could not find runw.exe in target dir!"
) || fail "PyInstaller build failed"
info "Installing PyInstaller."
$PYTHON -m pip install --no-warn-script-location ./pyinstaller
$PYTHON -m pip install --no-dependencies --no-warn-script-location ./pyinstaller
info "Wine is configured."