From c2493f9d6dcd0bdcf028dfce9b7b8f6356fa9eea Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Thu, 17 Aug 2017 12:20:39 +0300 Subject: Use libusb compiled with MSVC 2015 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/libusb.ps1 | 6 +++--- coin/provisioning/qtci-windows-7-x86/libusb.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/libusb.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-7-x86/libusb.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/libusb.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 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" -- cgit v1.2.3