Browse Source

Follow-up 6afe71fe

3.2.x
Johann Bauer 7 years ago
parent
commit
ae80fb4f97
No known key found for this signature in database GPG Key ID: 84F1BF925B1F484D
  1. 6
      contrib/build-osx/make_osx
  2. 4
      contrib/build-wine/build-electrum-git.sh
  3. 2
      contrib/build-wine/prepare-wine.sh

6
contrib/build-osx/make_osx

@ -56,12 +56,12 @@ tar xz --directory $BUILDDIR
cp $BUILDDIR/libusb/1.0.22/lib/libusb-1.0.dylib contrib/build-osx
info "Installing requirements..."
python3 -m pip install --require-hashes -Ir ./contrib/deterministic-build/requirements.txt --user && \
python3 -m pip install --require-hashes -Ir ./contrib/deterministic-build/requirements-binaries.txt --user || \
python3 -m pip install -Ir ./contrib/deterministic-build/requirements.txt --user && \
python3 -m pip install -Ir ./contrib/deterministic-build/requirements-binaries.txt --user || \
fail "Could not install requirements"
info "Installing hardware wallet requirements..."
python3 -m pip install --require-hashes -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \
python3 -m pip install -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \
fail "Could not install hardware wallet requirements"
info "Building $PACKAGE..."

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

@ -56,9 +56,9 @@ cp -r electrum-locale/locale $WINEPREFIX/drive_c/electrum/lib/
cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrum/gui/qt/
# Install frozen dependencies
$PYTHON -m pip install --require-hashes -r ../../deterministic-build/requirements.txt
$PYTHON -m pip install -r ../../deterministic-build/requirements.txt
$PYTHON -m pip install --require-hashes -r ../../deterministic-build/requirements-hw.txt
$PYTHON -m pip install -r ../../deterministic-build/requirements-hw.txt
pushd $WINEPREFIX/drive_c/electrum
$PYTHON setup.py install

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

@ -112,7 +112,7 @@ $PYTHON -m pip install pywin32-ctypes==0.1.2
# install PySocks
$PYTHON -m pip install win_inet_pton==1.0.1
$PYTHON -m pip install --require-hashes -r $here/../deterministic-build/requirements-binaries.txt
$PYTHON -m pip install $here/../deterministic-build/requirements-binaries.txt
# Install PyInstaller
$PYTHON -m pip install https://github.com/ecdsa/pyinstaller/archive/fix_2952.zip

Loading…
Cancel
Save