twine build: dedupe PYTHON_VERSION - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 762082e13d7e9db7c1ca603a04d9dc1aebe8b0af
DIR parent f59a4f85dbbe820e4dfe12437941dd5c6880f2db
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Sun, 9 Dec 2018 07:17:37 +0100
wine build: dedupe PYTHON_VERSION
Diffstat:
M contrib/build-wine/build-electrum-… | 5 ++---
M contrib/build-wine/deterministic.s… | 3 +--
M contrib/build-wine/docker/README.md | 2 +-
M contrib/build-wine/prepare-wine.sh | 7 ++++---
4 files changed, 8 insertions(+), 9 deletions(-)
---
DIR diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh
t@@ -1,14 +1,13 @@
#!/bin/bash
NAME_ROOT=electrum
-PYTHON_VERSION=3.6.6
# These settings probably don't need any change
export WINEPREFIX=/opt/wine64
export PYTHONDONTWRITEBYTECODE=1
export PYTHONHASHSEED=22
-PYHOME=c:/python$PYTHON_VERSION
+PYHOME=c:/python3
PYTHON="wine $PYHOME/python.exe -OO -B"
t@@ -60,7 +59,7 @@ cd ..
rm -rf dist/
# build standalone and portable versions
-wine "C:/python$PYTHON_VERSION/scripts/pyinstaller.exe" --noconfirm --ascii --clean --name $NAME_ROOT-$VERSION -w deterministic.spec
+wine "$PYHOME/scripts/pyinstaller.exe" --noconfirm --ascii --clean --name $NAME_ROOT-$VERSION -w deterministic.spec
# set timestamps in dist, in order to make the installer reproducible
pushd dist
DIR diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
t@@ -10,8 +10,7 @@ for i, x in enumerate(sys.argv):
else:
raise Exception('no name')
-PYTHON_VERSION = '3.6.6'
-PYHOME = 'c:/python' + PYTHON_VERSION
+PYHOME = 'c:/python3'
home = 'C:\\electrum\\'
DIR diff --git a/contrib/build-wine/docker/README.md b/contrib/build-wine/docker/README.md
t@@ -42,7 +42,7 @@ folder.
And then build from this directory:
```
$ git checkout $REV
- $ sudo docker run \
+ $ sudo docker run -it \
--name electrum-wine-builder-cont \
-v $PWD:/opt/wine64/drive_c/electrum \
--rm \
DIR diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh
t@@ -19,7 +19,8 @@ PYTHON_VERSION=3.6.6
export WINEPREFIX=/opt/wine64
#export WINEARCH='win32'
-PYHOME=c:/python$PYTHON_VERSION
+PYTHON_FOLDER="python3"
+PYHOME="c:/$PYTHON_FOLDER"
PYTHON="wine $PYHOME/python.exe -OO -B"
t@@ -105,7 +106,7 @@ for msifile in core dev exe lib pip tools; do
wget -N -c "https://www.python.org/ftp/python/$PYTHON_VERSION/win32/${msifile}.msi"
wget -N -c "https://www.python.org/ftp/python/$PYTHON_VERSION/win32/${msifile}.msi.asc"
verify_signature "${msifile}.msi.asc" $KEYRING_PYTHON_DEV
- wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/python$PYTHON_VERSION
+ wine msiexec /i "${msifile}.msi" /qb TARGETDIR=$PYHOME
done
# upgrade pip
t@@ -136,7 +137,7 @@ download_if_not_exist $LIBUSB_FILENAME "$LIBUSB_URL"
verify_hash $LIBUSB_FILENAME "$LIBUSB_SHA256"
7z x -olibusb $LIBUSB_FILENAME -aoa
-cp libusb/MS32/dll/libusb-1.0.dll $WINEPREFIX/drive_c/python$PYTHON_VERSION/
+cp libusb/MS32/dll/libusb-1.0.dll $WINEPREFIX/drive_c/$PYTHON_FOLDER/
mkdir -p $WINEPREFIX/drive_c/tmp
cp secp256k1/libsecp256k1.dll $WINEPREFIX/drive_c/tmp/