Simplify pyinstaller installation
This commit is contained in:
parent
fe1e412f01
commit
e512e9c0e8
|
@ -37,7 +37,7 @@ fail "Unable to use Python $PYTHON_VERSION"
|
|||
|
||||
|
||||
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:"
|
||||
sw_vers
|
||||
|
|
|
@ -13,8 +13,7 @@ echo "Clearing $here/build and $here/dist..."
|
|||
rm "$here"/build/* -rf
|
||||
rm "$here"/dist/* -rf
|
||||
|
||||
$here/prepare-wine.sh && \
|
||||
$here/prepare-pyinstaller.sh || exit 1
|
||||
$here/prepare-wine.sh || exit 1
|
||||
|
||||
echo "Resetting modification time in C:\Python..."
|
||||
# (Because of some bugs in pyinstaller)
|
||||
|
|
|
@ -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
|
|
@ -80,6 +80,10 @@ $PYTHON -m pip install win_inet_pton==1.0.1
|
|||
|
||||
$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
|
||||
#wget -q -O zbar.exe "https://sourceforge.net/projects/zbar/files/zbar/0.10/zbar-0.10-setup.exe/download"
|
||||
#wine zbar.exe
|
||||
|
|
Loading…
Reference in New Issue