lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.11' into 5.12

Browse Source 
Conflicts:
	coin/provisioning/common/unix/mqtt_broker.sh

Change-Id: I990dbf66b7120f2f1bcf202f0a2547a5ad9881f2
This commit is contained in:
Liang Qi
2018-11-20 19:37:06 +01:00
parent 2a4eafbc77 a9a4b97c70
commit 0c839f87fb
8 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.commit-template
View File

@@ -13,7 +13,7 @@
# Use Fixes to automatically close an issue, and Task-number to
# reference it without further action.
# You do not need both for the same issue.
#Fixes:
#Fixes:
#Task-number:
#Coverity-Id:
#

2
coin/provisioning/common/unix/mqtt_broker.sh
View File

@@ -40,7 +40,7 @@ source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e"
PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
SHA1="a0ac88715c2aebb9573a113dc13925a90da19233"
targetFolder="/opt/paho_broker"

2
coin/provisioning/common/windows/jom.ps1
View File

@@ -3,7 +3,7 @@
$version = "1_1_2"
$zip = Get-DownloadLocation "jom_$version.zip"
Download http://download.qt.io/official_releases/jom/jom_$version.zip http://ci-files01-hki.ci.local/input/windows/jom_$version.zip $zip
Download http://download.qt.io/official_releases/jom/jom_$version.zip http://ci-files01-hki.intra.qt.io/input/windows/jom_$version.zip $zip
Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"
Extract-7Zip $zip C:\Utils\Jom

2
coin/provisioning/common/windows/mqtt_broker.ps1
View File

@@ -38,7 +38,7 @@ $zip = Get-DownloadLocation "pahotest.zip"
$commitSHA = "20bad2475c27a6e1d24a56d90a9fceb40963261e"
$sha1 = "a0ac88715c2aebb9573a113dc13925a90da19233"
$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"
Download $externalUrl $internalUrl $zip

2
coin/provisioning/common/windows/vulkansdk.ps1
View File

@@ -36,7 +36,7 @@
# This script will install Vulkan SDK
$version = "1.0.51.0"
$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
Copy-Item $url_cache $vulkanPackage

2
coin/provisioning/common/windows/win10sdk.ps1
View File

@@ -35,7 +35,7 @@
# This script will install Windows 10 SDK
$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\winsdksetup.exe"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\winsdksetup.exe"
$url_official = "https://download.microsoft.com/download/8/C/3/8C37C5CE-C6B9-4CC8-8B5F-149A9C976035/windowssdk/winsdksetup.exe"
$package = "C:\Windows\Temp\winsdksetup.exe"
$sha1 = "db237323f1779fb143e7cdc558e4345e7004489e"

2
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
View File

@@ -42,3 +42,5 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
if [ "$http_proxy" != "" ]; then
echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
fi
sudo yum update -y nss curl

11
init-repository
View File

@@ -299,7 +299,7 @@ use constant {
sub git_clone_all_submodules
{
my ($self, $my_repo_base, $co_branch, @subset) = @_;
my ($self, $my_repo_base, $co_branch, $alternates, @subset) = @_;
my %subdirs = ();
my %subbranches = ();
@@ -406,7 +406,7 @@ sub git_clone_all_submodules
foreach my $module (@modules) {
$self->git_clone_one_submodule($subdirs{$module}, $subbases{$module},
$co_branch && $subbranches{$module});
$co_branch && $subbranches{$module}, $alternates);
}
if ($co_branch) {
@@ -434,7 +434,7 @@ sub git_clone_all_submodules
if (-f $module.'/.gitmodules') {
my $orig_cwd = getcwd();
chdir($module) or confess "chdir $module: $OS_ERROR";
$self->git_clone_all_submodules($subbases{$module}, 0, "all");
$self->git_clone_all_submodules($subbases{$module}, 0, "$alternates/$module", "all");
chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR";
}
}
@@ -491,9 +491,8 @@ sub git_stat_one_submodule
sub git_clone_one_submodule
{
my ($self, $submodule, $repo_basename, $branch) = @_;
my ($self, $submodule, $repo_basename, $branch, $alternates) = @_;
my $alternates = $self->{ 'alternates' };
my $mirror_url = $self->{ 'mirror-url' };
my $protocol = $self->{ 'protocol' };
@@ -643,7 +642,7 @@ sub run
$url =~ s/qt5$//;
$self->{'base-url'} = $url;
$self->git_clone_all_submodules('qt5', $self->{branch}, @{$self->{'module-subset'}});
$self->git_clone_all_submodules('qt5', $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}});
$self->git_add_remotes('qt5');