summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2017-08-17 12:20:39 +0300
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-21 17:49:27 +0000
commitc2493f9d6dcd0bdcf028dfce9b7b8f6356fa9eea (patch)
treea0dd3364a378551d1f0b82ae10552b6e865ffb06
parent79db6fc85647a8b63ce7e450c38baf80294b86b6 (diff)
Use libusb compiled with MSVC 2015
QDB has to change to using Windows 10 for releases, because Windows 8.1 is no longer available for non-qt5 builds as a packaging platform in 5.9 branch. Don't provision libusb on earlier Windows versions, since they don't have a compatible compiler. Change-Id: I771a24fcf208c4961483a39e51cb7d95f004ed55 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
-rw-r--r--coin/provisioning/common/libusb.ps16
-rw-r--r--coin/provisioning/qtci-windows-7-x86/libusb.ps11
-rw-r--r--coin/provisioning/qtci-windows-8-x86/libusb.ps11
-rw-r--r--coin/provisioning/qtci-windows-8-x86_64/libusb.ps11
4 files changed, 3 insertions, 6 deletions
diff --git a/coin/provisioning/common/libusb.ps1 b/coin/provisioning/common/libusb.ps1
index 929c42d7..38d8b8e6 100644
--- a/coin/provisioning/common/libusb.ps1
+++ b/coin/provisioning/common/libusb.ps1
@@ -35,11 +35,11 @@
. "$PSScriptRoot\helpers.ps1"
-$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196.7z"
+$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196-msvc2015.7z"
$libusb_location = "C:\Utils\libusb-1.0"
-Download https://vorboss.dl.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/libusb-1.0.21.7z \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196.7z $archive
-Verify-Checksum $archive "160892df83742639da32acc8dabd4f95a4f448e1"
+Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive
+Verify-Checksum $archive "396a3224c306480f24a583850d923d06aa4377c1"
Extract-7Zip $archive $libusb_location
diff --git a/coin/provisioning/qtci-windows-7-x86/libusb.ps1 b/coin/provisioning/qtci-windows-7-x86/libusb.ps1
deleted file mode 100644
index a853ffef..00000000
--- a/coin/provisioning/qtci-windows-7-x86/libusb.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/libusb.ps1 b/coin/provisioning/qtci-windows-8-x86/libusb.ps1
deleted file mode 100644
index a853ffef..00000000
--- a/coin/provisioning/qtci-windows-8-x86/libusb.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 b/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1
deleted file mode 100644
index a853ffef..00000000
--- a/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libusb.ps1"