LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 09:45:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify pyinstaller installation

Browse source
This commit is contained in:
Johann Bauer 2018-02-15 22:23:10 +01:00
parent fe1e412f01
commit e512e9c0e8
4 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/build-osx/make_osx
View file

@ -37,7 +37,7 @@ fail "Unable to use Python $PYTHON_VERSION"
info "Installing pyinstaller" info "Installing pyinstaller"
python3 -m pip install pyinstaller -I --user || fail "Could not install pyinstaller" python3 -m pip install git+https://github.com/ecdsa/pyinstaller@fix_2952 -I --user || fail "Could not install pyinstaller"
info "Using these versions for building $PACKAGE:" info "Using these versions for building $PACKAGE:"
sw_vers sw_vers

3
contrib/build-wine/build.sh
View file

@ -13,8 +13,7 @@ echo "Clearing $here/build and $here/dist..."
rm "$here"/build/* -rf rm "$here"/build/* -rf
rm "$here"/dist/* -rf rm "$here"/dist/* -rf
$here/prepare-wine.sh && \ $here/prepare-wine.sh || exit 1
$here/prepare-pyinstaller.sh || exit 1
echo "Resetting modification time in C:\Python..." echo "Resetting modification time in C:\Python..."
# (Because of some bugs in pyinstaller) # (Because of some bugs in pyinstaller)

24
contrib/build-wine/prepare-pyinstaller.sh
View file

@ -1,24 +0,0 @@
#!/bin/bash
PYTHON_VERSION=3.5.4
PYINSTALLER_GIT_URL=https://github.com/ecdsa/pyinstaller.git
BRANCH=fix_2952
export WINEPREFIX=/opt/wine64
PYHOME=c:/python$PYTHON_VERSION
PYTHON="wine $PYHOME/python.exe -OO -B"
cd `dirname $0`
set -e
cd tmp
if [ ! -d "pyinstaller" ]; then
git clone -b $BRANCH $PYINSTALLER_GIT_URL pyinstaller
fi
cd pyinstaller
git pull
git checkout $BRANCH
$PYTHON setup.py install
cd ..
wine "C:/python$PYTHON_VERSION/scripts/pyinstaller.exe" -v

4
contrib/build-wine/prepare-wine.sh
View file

@ -80,6 +80,10 @@ $PYTHON -m pip install win_inet_pton==1.0.1
$PYTHON -m pip install -r ../../deterministic-build/requirements-binaries.txt $PYTHON -m pip install -r ../../deterministic-build/requirements-binaries.txt
# Install PyInstaller
$PYTHON -m pip install git+https://github.com/ecdsa/pyinstaller@fix_2952
# Install ZBar # Install ZBar
#wget -q -O zbar.exe "https://sourceforge.net/projects/zbar/files/zbar/0.10/zbar-0.10-setup.exe/download" #wget -q -O zbar.exe "https://sourceforge.net/projects/zbar/files/zbar/0.10/zbar-0.10-setup.exe/download"
#wine zbar.exe #wine zbar.exe