mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
This commit is contained in:
Simon Hausmann
@@ -16,8 +16,8 @@ qtci-linux-RHEL-6.6-x86_64 GCC
|
||||
qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker
|
||||
qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release DisableTests
|
||||
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
|
||||
qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release
|
||||
qtci-osx-10.10-x86_64 Clang Release NoFramework
|
||||
qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release DisableTests
|
||||
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
|
||||
qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static
|
||||
qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro armv7 GCC Release
|
||||
|
||||
@@ -15,8 +15,6 @@ qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packagin
|
||||
qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-windows-7-x86-2 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-7-x86-2 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2
|
||||
qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip"
|
||||
|
||||
Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip
|
||||
Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.ci.local\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip
|
||||
Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
|
||||
|
||||
Extract-Zip $zip C:
|
||||
|
||||
@@ -53,6 +53,32 @@ function Extract-Zip
|
||||
$destinationFolder.CopyHere($zipfile.Items(), 16)
|
||||
}
|
||||
|
||||
function Extract-Dev-Folders-From-Zip
|
||||
{
|
||||
Param (
|
||||
[string]$package,
|
||||
[string]$zipDir,
|
||||
[string]$installPath
|
||||
)
|
||||
|
||||
$shell = new-object -com shell.application
|
||||
|
||||
echo "Extracting contents of $package"
|
||||
foreach ($subDir in "lib", "include", "bin", "share") {
|
||||
$zip = $shell.Namespace($package + "\" + $zipDir + "\" + $subDir)
|
||||
if ($zip) {
|
||||
Write-Host "Extracting $subDir from zip archive"
|
||||
} else {
|
||||
Write-Host "$subDir is missing from zip archive - skipping"
|
||||
continue
|
||||
}
|
||||
$destDir = $installPath + "\" + $subdir
|
||||
New-Item $destDir -type directory
|
||||
$destinationFolder = $shell.Namespace($destDir)
|
||||
$destinationFolder.CopyHere($zip.Items(), 16)
|
||||
}
|
||||
}
|
||||
|
||||
function BadParam
|
||||
{
|
||||
Param ([string]$Description)
|
||||
@@ -67,7 +93,11 @@ function Download
|
||||
[string] $Destination = $(BadParam("a download target location"))
|
||||
)
|
||||
try {
|
||||
Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
|
||||
if ($CachedUrl.StartsWith("http")) {
|
||||
Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
|
||||
} else {
|
||||
Copy-Item $CachedUrl $Destination
|
||||
}
|
||||
} catch {
|
||||
Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination
|
||||
}
|
||||
|
||||
60
coin/provisioning/common/msvc_2015_update3_patch.ps1
Normal file
60
coin/provisioning/common/msvc_2015_update3_patch.ps1
Normal file
@@ -0,0 +1,60 @@
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
|
||||
# Install Cumulative Servicing Release Visual Studio 2015 update 3
|
||||
# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
|
||||
|
||||
$version = "2015 update3 (KB3165756)"
|
||||
$package = "C:\Windows\Temp\vs14-kb3165756.exe"
|
||||
$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe"
|
||||
$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
|
||||
$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
|
||||
$preparedPackage="\\ci-files01-hki.ci.local\provisioning\windows\vs14-kb3165756-update"
|
||||
|
||||
if (Test-Path $preparedPackage) {
|
||||
echo "Using prepared package"
|
||||
pushd $preparedPackage
|
||||
$commandLine = "$preparedPackage\vs14-kb3165756.exe"
|
||||
} else {
|
||||
echo "Fetching patch for Visual Studio $version..."
|
||||
Download $url_official $url_cache $package
|
||||
Verify-Checksum $package $sha1
|
||||
$commandLine = $package
|
||||
}
|
||||
echo "Installing patch for Visual Studio $version..."
|
||||
. $commandLine /norestart /passive
|
||||
|
||||
if ($commandLine.StartsWith("C:\Windows")) {
|
||||
remove-item $package
|
||||
}
|
||||
@@ -43,12 +43,12 @@ $package = "C:\Windows\temp\python-$version.msi"
|
||||
if ( $archVer -eq 64 ) {
|
||||
echo "Running in 64 bit system"
|
||||
$externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi"
|
||||
$internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.amd64.msi"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.amd64.msi"
|
||||
$sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
|
||||
}
|
||||
else {
|
||||
$externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi"
|
||||
$internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.msi"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.msi"
|
||||
$sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0"
|
||||
}
|
||||
|
||||
|
||||
@@ -56,6 +56,6 @@ Function Remove-Path {
|
||||
}
|
||||
|
||||
# Remove Android sdk and ndk
|
||||
Remove C:\utils\android*
|
||||
dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" }
|
||||
[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
|
||||
[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User")
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
|
||||
. "$PSScriptRoot\..\common\windows_removethemall.ps1"
|
||||
|
||||
@@ -30,21 +30,5 @@
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
|
||||
|
||||
# Install Cumulative Servicing Release Visual Studio 2015 update 3
|
||||
# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
|
||||
# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe
|
||||
|
||||
$version = "2015 update3 (KB3165756)"
|
||||
$package = "C:\Windows\Temp\vs14-kb3165756.exe"
|
||||
$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe"
|
||||
$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
|
||||
$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
|
||||
|
||||
echo "Fetching patch for Visual Studio $version..."
|
||||
Download $url_official $url_cache $package
|
||||
Verify-Checksum $package $sha1
|
||||
echo "Installing patch for Visual Studio $version..."
|
||||
cmd /c "$package /norestart /Quiet"
|
||||
remove-item $package
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
|
||||
. "$PSScriptRoot\..\common\windows_removethemall.ps1"
|
||||
|
||||
@@ -30,21 +30,5 @@
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
|
||||
|
||||
# Install Cumulative Servicing Release Visual Studio 2015 update 3
|
||||
# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
|
||||
# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe
|
||||
|
||||
$version = "2015 update3 (KB3165756)"
|
||||
$package = "C:\Windows\Temp\vs14-kb3165756.exe"
|
||||
$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe"
|
||||
$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
|
||||
$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
|
||||
|
||||
echo "Fetching patch for Visual Studio $version..."
|
||||
Download $url_official $url_cache $package
|
||||
Verify-Checksum $package $sha1
|
||||
echo "Installing patch for Visual Studio $version..."
|
||||
cmd /c "$package /norestart /Quiet"
|
||||
remove-item $package
|
||||
|
||||
@@ -37,76 +37,52 @@
|
||||
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
|
||||
|
||||
$version = "5.6.11"
|
||||
$packagex64 = "C:\Windows\temp\mysql-$version-win64.zip"
|
||||
$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip"
|
||||
$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"
|
||||
|
||||
function CheckAndRemovePreviousInstallation
|
||||
{
|
||||
Param (
|
||||
[string]$InstallFolder
|
||||
)
|
||||
echo "Check for previous installation..."
|
||||
$FolderExists = Test-Path $ExistingInstallation
|
||||
If ($FolderExists -eq $True) {
|
||||
echo "Removing previous installation ($ExistingInstallation)"
|
||||
Remove-Item $ExistingInstallation -recurse
|
||||
}
|
||||
}
|
||||
|
||||
function DownloadAndInstall
|
||||
{
|
||||
Param (
|
||||
[string]$arch,
|
||||
[string]$externalUrl,
|
||||
[string]$internalUrl,
|
||||
[string]$package,
|
||||
[string]$sha1,
|
||||
[string]$installPath
|
||||
)
|
||||
|
||||
echo "Fetching from URL ..."
|
||||
Download $externalUrl $internalUrl $package
|
||||
Verify-Checksum $package $sha1
|
||||
Extract-Zip $package $installPath
|
||||
echo "Fetching from URL ..."
|
||||
Copy-Item $internalUrl $package
|
||||
|
||||
$zipDir = [io.path]::GetFileNameWithoutExtension($package)
|
||||
Extract-Dev-Folders-From-Zip $package $zipDir $installPath
|
||||
|
||||
Remove-Item $package
|
||||
}
|
||||
|
||||
# Remove any leftovers
|
||||
try {
|
||||
Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
|
||||
} catch {}
|
||||
|
||||
# Install x64 bit version
|
||||
$architecture = "x64"
|
||||
$installFolder = "C:\Utils\my_sql"
|
||||
$existingInstallation = "$installFolder\my_sql"
|
||||
$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-winx64"
|
||||
$sha1 = "f4811512b5f3c8ad877ee4feba2062312a0acc38"
|
||||
$installFolder = "C:\Utils\my_sql\my_sql"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-winx64.zip"
|
||||
|
||||
echo "Check and remove previous installation ..."
|
||||
CheckAndRemovePreviousInstallation $existingInstallation
|
||||
DownloadAndInstall $architecture $internalUrl $internalUrl $packagex64 $sha1 $installFolder
|
||||
Rename-Item -path $installFolder\mysql-$version-winx64 -newName $installFolder\my_sql
|
||||
|
||||
echo "Remove downloaded package ..."
|
||||
Remove-Item $packagex64
|
||||
DownloadAndInstall $internalUrl $packagex64 $installFolder
|
||||
|
||||
echo "Set environment variables ..."
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
|
||||
|
||||
# Install x86 bit version
|
||||
$architecture = "x86"
|
||||
$installFolder = "C:\Utils\my_sql$architecture"
|
||||
$existingInstallation = "$installFolder\my_sql"
|
||||
$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-win32"
|
||||
$sha1 = "e0aa62d5c5d6c6ec28906a831752d04336562679"
|
||||
$installFolder = "C:\Utils\my_sql\my_sql$architecture"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-win32.zip"
|
||||
|
||||
echo "Check and remove previous installation ..."
|
||||
CheckAndRemovePreviousInstallation $existingInstallation
|
||||
DownloadAndInstall $architecture $internalUrl $internalUrl $packagex86 $sha1 $installFolder
|
||||
Rename-Item -path $installFolder\mysql-$version-win32 -newName $installFolder\my_sql
|
||||
|
||||
echo "Remove downloaded package ..."
|
||||
Remove-Item $packagex86
|
||||
DownloadAndInstall $internalUrl $packagex86 $installFolder
|
||||
|
||||
echo "Set environment variables ..."
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine")
|
||||
|
||||
# Store version information to ~/versions.txt, which is used to print version information to provision log.
|
||||
echo "MySQL = $version" >> ~/versions.txt
|
||||
|
||||
@@ -40,7 +40,7 @@ $openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
|
||||
|
||||
$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
|
||||
$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
|
||||
$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll"
|
||||
$openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll"
|
||||
$openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
|
||||
|
||||
Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package
|
||||
|
||||
@@ -44,7 +44,7 @@ $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
|
||||
$architecture = "x64"
|
||||
$installFolder = "C:\openssl"
|
||||
$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
|
||||
$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win64OpenSSL-$version.exe"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win64OpenSSL-$version.exe"
|
||||
$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
|
||||
|
||||
echo "Fetching from URL ..."
|
||||
@@ -65,7 +65,7 @@ echo "Set $architecture environment variables ..."
|
||||
$architecture = "x86"
|
||||
$installFolder = "C:\openssl$architecture"
|
||||
$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
|
||||
$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win32OpenSSL-$version.exe"
|
||||
$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
|
||||
|
||||
echo "Fetching from URL ..."
|
||||
|
||||
@@ -42,43 +42,48 @@ $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
|
||||
|
||||
# Install x64 bit versions
|
||||
$architecture = "x64"
|
||||
$installFolder = "C:\Utils\postgresql"
|
||||
$installFolder = "C:\Utils\postgresql\pgsql"
|
||||
$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
|
||||
$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-x64-binaries.zip"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
|
||||
$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
|
||||
|
||||
# Delete any leftovers
|
||||
try {
|
||||
Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted
|
||||
} catch {}
|
||||
|
||||
echo "Fetching from URL ..."
|
||||
Download $externalUrl $internalUrl $packagex64
|
||||
Verify-Checksum $packagex64 $sha1
|
||||
echo "Installing $packagex64 ..."
|
||||
Extract-Zip $packagex64 $installFolder
|
||||
Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
|
||||
|
||||
echo "Remove downloaded $packagex64 ..."
|
||||
Remove-Item $packagex64
|
||||
|
||||
echo "Set $architecture environment variables ..."
|
||||
[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\pgsql\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\pgsql\lib", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine")
|
||||
|
||||
# Install x86 bit version
|
||||
$architecture = "x86"
|
||||
$installFolder = "C:\Utils\postgresql$architecture"
|
||||
$installFolder = "C:\Utils\postgresql$architecture\pgsql"
|
||||
$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip"
|
||||
$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-binaries.zip"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-binaries.zip"
|
||||
$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
|
||||
|
||||
echo "Fetching from URL..."
|
||||
Download $externalUrl $internalUrl $packagex86
|
||||
Verify-Checksum $packagex86 $sha1
|
||||
echo "Installing $packagex86 ..."
|
||||
Extract-Zip $packagex86 $installFolder
|
||||
Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder
|
||||
|
||||
echo "Remove downloaded $packagex86 ..."
|
||||
Remove-Item $packagex86
|
||||
|
||||
echo "Set $architecture environment variables ..."
|
||||
[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\pgsql\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\pgsql\lib", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine")
|
||||
|
||||
# Store version information to ~/versions.txt, which is used to print version information to provision log.
|
||||
echo "PostgreSQL = $version" >> ~/versions.txt
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
|
||||
. "$PSScriptRoot\..\common\windows_removethemall.ps1"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# This script will install msys which is needed for configuring openssl for Android
|
||||
|
||||
$version = "1.0.11"
|
||||
$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z"
|
||||
$url = "\\ci-files01-hki.ci.local\provisioning\windows\msys-$version.7z"
|
||||
|
||||
$zip = "c:\users\qt\downloads\msys-$version.7z"
|
||||
$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
# NDK
|
||||
$ndkVersion = "r10e"
|
||||
$ndkCachedUrl = "http://ci-files01-hki.ci.local/input/android/android-ndk-$ndkVersion-windows-x86.zip"
|
||||
$ndkCachedUrl = "\\ci-files01-hki.ci.local\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
|
||||
$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
|
||||
$ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357"
|
||||
$ndkFolder = "c:\utils\android-ndk-$ndkVersion"
|
||||
@@ -19,7 +19,7 @@ $sdkVersion = "r24.4.1"
|
||||
$sdkApi = "ANDROID_API_VERSION"
|
||||
$sdkApiLevel = "android-21"
|
||||
$sdkBuildToolsVersion = "23.0.3"
|
||||
$sdkCachedUrl= "http://ci-files01-hki.ci.local/input/android/android-sdk_$sdkVersion-windows.zip"
|
||||
$sdkCachedUrl= "\\ci-files01-hki.ci.local\provisioning\android\android-sdk_$sdkVersion-windows.zip"
|
||||
$sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip"
|
||||
$sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49"
|
||||
$sdkFolder = "c:\utils\android-sdk-windows"
|
||||
|
||||
@@ -9,7 +9,7 @@ $zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
|
||||
$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
|
||||
$destination = "C:\Utils\openssl-android-master"
|
||||
|
||||
Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip
|
||||
Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.ci.local\provisioning\openssl\openssl-$version.tar.gz $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
|
||||
C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
|
||||
. "$PSScriptRoot\..\common\windows_removethemall.ps1"
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
|
||||
. "$PSScriptRoot\..\common\windows_removethemall.ps1"
|
||||
|
||||
Reference in New Issue
Block a user