diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index 145d9b35b..f54583f1e 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -4,6 +4,7 @@ NAME_ROOT=electrum # These settings probably don't need any change export WINEPREFIX=/opt/wine64 +export WINEDEBUG=-all export PYTHONDONTWRITEBYTECODE=1 export PYTHONHASHSEED=22 @@ -42,14 +43,14 @@ popd # Install frozen dependencies -$PYTHON -m pip install -r "$CONTRIB"/deterministic-build/requirements.txt +$PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements.txt -$PYTHON -m pip install -r "$CONTRIB"/deterministic-build/requirements-hw.txt +$PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-hw.txt 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 . +$PYTHON -m pip install --no-warn-script-location . popd diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index 4bc147841..e4b8c873b 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -21,7 +21,7 @@ PYTHON_VERSION=3.6.8 ## These settings probably don't need change export WINEPREFIX=/opt/wine64 -#export WINEARCH='win32' +export WINEDEBUG=-all PYTHON_FOLDER="python3" PYHOME="c:/$PYTHON_FOLDER" @@ -58,7 +58,7 @@ done info "Installing dependencies specific to binaries." # note that this also installs pinned versions of both pip and setuptools -$PYTHON -m pip install -r "$CONTRIB"/deterministic-build/requirements-binaries.txt +$PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-binaries.txt info "Installing ZBar." download_if_not_exist "$CACHEDIR/$ZBAR_FILENAME" "$ZBAR_URL" @@ -107,6 +107,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 ./pyinstaller +$PYTHON -m pip install --no-warn-script-location ./pyinstaller info "Wine is configured."