From 9a12022537cb8e67dc38180ce4282f29089cf5b4 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sat, 31 Mar 2018 00:14:26 +0200 Subject: [PATCH] windows build script: update python, nsis, libusb --- contrib/build-wine/build-electrum-git.sh | 2 +- contrib/build-wine/deterministic.spec | 4 +++- contrib/build-wine/prepare-wine.sh | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index 2fd6ea007..c3b92d62c 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -1,7 +1,7 @@ #!/bin/bash NAME_ROOT=electrum -PYTHON_VERSION=3.5.4 +PYTHON_VERSION=3.6.5 # These settings probably don't need any change export WINEPREFIX=/opt/wine64 diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec index 33dfd60ba..5b08dbf34 100644 --- a/contrib/build-wine/deterministic.spec +++ b/contrib/build-wine/deterministic.spec @@ -10,6 +10,8 @@ for i, x in enumerate(sys.argv): else: raise BaseException('no name') +PYTHON_VERSION = '3.6.5' +PYHOME = 'c:/python' + PYTHON_VERSION home = 'C:\\electrum\\' @@ -21,7 +23,7 @@ hiddenimports += collect_submodules('keepkeylib') hiddenimports += collect_submodules('websocket') # Add libusb binary -binaries = [("c:/python3.5.4/libusb-1.0.dll", ".")] +binaries = [(PYHOME+"/libusb-1.0.dll", ".")] # Workaround for "Retro Look": binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]] diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index 5e5864e05..27c34e7f4 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -1,19 +1,19 @@ #!/bin/bash # Please update these carefully, some versions won't work under Wine -NSIS_FILENAME=nsis-3.02.1-setup.exe +NSIS_FILENAME=nsis-3.03-setup.exe NSIS_URL=https://prdownloads.sourceforge.net/nsis/$NSIS_FILENAME?download -NSIS_SHA256=736c9062a02e297e335f82252e648a883171c98e0d5120439f538c81d429552e +NSIS_SHA256=bd3b15ab62ec6b0c7a00f46022d441af03277be893326f6fea8e212dc2d77743 ZBAR_FILENAME=zbarw-20121031-setup.exe ZBAR_URL=https://sourceforge.net/projects/zbarw/files/$ZBAR_FILENAME/download ZBAR_SHA256=177e32b272fa76528a3af486b74e9cb356707be1c5ace4ed3fcee9723e2c2c02 -LIBUSB_FILENAME=libusb-1.0.21.7z -LIBUSB_URL=https://prdownloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/$LIBUSB_FILENAME?download -LIBUSB_SHA256=acdde63a40b1477898aee6153f9d91d1a2e8a5d93f832ca8ab876498f3a6d2b8 +LIBUSB_FILENAME=libusb-1.0.22.7z +LIBUSB_URL=https://prdownloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.22/$LIBUSB_FILENAME?download +LIBUSB_SHA256=671f1a420757b4480e7fadc8313d6fb3cbb75ca00934c417c1efa6e77fb8779b -PYTHON_VERSION=3.5.4 +PYTHON_VERSION=3.6.5 ## These settings probably don't need change export WINEPREFIX=/opt/wine64