electrum

commit 78a9424c48bd47d0d89470c6960bbe75f49bae64
parent fcae5eaa92b981fcca1601f88106c70e8450c933
Author: Johann Bauer <bauerj@bauerj.eu>
Date:   Wed, 21 Feb 2018 01:39:57 +0100

Add libusb dll to Windows binary

So that Trezor still works...

Closes: #3931

Diffstat:
M
contrib/build-wine/deterministic.spec
 | 
1
+
M
contrib/build-wine/prepare-wine.sh
 | 
12
++++++++++--

2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
@@ -51,6 +51,7 @@ a = Analysis([home+'electrum',
               home+'plugins/ledger/qt.py',
               #home+'packages/requests/utils.py'
               ],
+             binaries=[("c:/python3.5.4/libusb-1.0.dll", ".")],
              datas=datas,
              #pathex=[home+'lib', home+'gui', home+'plugins'],
              hiddenimports=hiddenimports,
diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh
@@ -3,6 +3,10 @@
 # Please update these carefully, some versions won't work under Wine
 NSIS_URL=https://prdownloads.sourceforge.net/nsis/nsis-3.02.1-setup.exe?download
 NSIS_SHA256=736c9062a02e297e335f82252e648a883171c98e0d5120439f538c81d429552e
+
+LIBUSB_URL=https://prdownloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/libusb-1.0.21.7z?download
+LIBUSB_SHA256=acdde63a40b1477898aee6153f9d91d1a2e8a5d93f832ca8ab876498f3a6d2b8
+
 PYTHON_VERSION=3.5.4
 
 ## These settings probably don't need change
@@ -81,8 +85,7 @@ $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
+$PYTHON -m pip install https://github.com/ecdsa/pyinstaller/archive/fix_2952.zip
 
 # Install ZBar
 #wget -q -O zbar.exe "https://sourceforge.net/projects/zbar/files/zbar/0.10/zbar-0.10-setup.exe/download"
@@ -97,6 +100,11 @@ wget -q -O nsis.exe "$NSIS_URL"
 verify_hash nsis.exe $NSIS_SHA256
 wine nsis.exe /S
 
+wget -q -O libusb.7z "$LIBUSB_URL"
+verify_hash libusb.7z "$LIBUSB_SHA256"
+7z x -olibusb libusb.7z
+cp libusb/MS32/dll/libusb-1.0.dll $WINEPREFIX/drive_c/python$PYTHON_VERSION/
+
 # Install UPX
 #wget -O upx.zip "https://downloads.sourceforge.net/project/upx/upx/3.08/upx308w.zip"
 #unzip -o upx.zip