From 5ccd922106ad2343b578be5ce08030ded2921e68 Mon Sep 17 00:00:00 2001
From: Dan Ackers <dan.ackers@qt.io>
Date: Thu, 29 Apr 2021 10:48:57 +0300
Subject: Libusb coin provisioning

Include libusb to linux, macos and windows

Task-number: QTBUG-90951
Change-Id: I633e731d84cc60064bc2d1942f6a1ce129240711
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 2cee9da977f4f8f0f5878839f7d150735e9bd691)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 coin/provisioning/common/windows/libusb.ps1            | 9 +++++----
 coin/provisioning/qtci-macos-10.14-x86_64/29-libusb.sh | 7 +++++++
 coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh  | 7 +++++++
 coin/provisioning/qtci-windows-10-x86_64/29-libusb.ps1 | 3 +++
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 coin/provisioning/qtci-macos-10.14-x86_64/29-libusb.sh
 create mode 100644 coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh
 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/29-libusb.ps1

(limited to 'coin')

diff --git a/coin/provisioning/common/windows/libusb.ps1 b/coin/provisioning/common/windows/libusb.ps1
index 68375263..5231b3c5 100644
--- a/coin/provisioning/common/windows/libusb.ps1
+++ b/coin/provisioning/common/windows/libusb.ps1
@@ -35,15 +35,16 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-$archive = Get-DownloadLocation "libusb-1.0.21-ife3db79196-msvc2015.7z"
+$archive = Get-DownloadLocation "libusb-1.0.24.7z"
+
 $libusb_location = "C:\Utils\libusb-1.0"
 
-Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive
-Verify-Checksum $archive "396a3224c306480f24a583850d923d06aa4377c1"
+Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.24.7z $archive
+Verify-Checksum $archive "1ACAAD5C8F5190A10958867101A5FEEF1FFA1CD8"
 
 Extract-7Zip $archive $libusb_location
 
 # Tell qt-apps/qdb build system where to find libusb
 Set-EnvironmentVariable "LIBUSB_PATH" $libusb_location
 
-Write-Output "libusb = libusb-1.0.21" >> ~/versions.txt
+Write-Output "libusb = libusb-1.0.24" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/29-libusb.sh b/coin/provisioning/qtci-macos-10.14-x86_64/29-libusb.sh
new file mode 100644
index 00000000..c58274b6
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/29-libusb.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+
+"$BASEDIR/../common/macos/libusb.sh"
diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh b/coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh
new file mode 100644
index 00000000..c58274b6
--- /dev/null
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+
+"$BASEDIR/../common/macos/libusb.sh"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/29-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/29-libusb.ps1
new file mode 100644
index 00000000..6035912d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/29-libusb.ps1
@@ -0,0 +1,3 @@
+
+
+. "$PSScriptRoot\..\common\windows\libusb.ps1"
-- 
cgit v1.2.3