From 99ff42545f4f3935858908278adf74cd02a91058 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 13 Sep 2016 19:35:38 +0300 Subject: Install Conan on Win10 QtWebKit will use Conan to install 3rd party dependencies like ICU. Task-number: QTQAINFRA-997 Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 coin/provisioning/common/conan.ps1 (limited to 'coin/provisioning/common/conan.ps1') diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 new file mode 100644 index 00000000..4b4e0726 --- /dev/null +++ b/coin/provisioning/common/conan.ps1 @@ -0,0 +1,7 @@ +. "$PSScriptRoot\helpers.ps1" + +$installer = "c:\users\qt\downloads\conan-win_0_12_0.exe" + +Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-win_0_12_0.exe http://ci-files01-hki.ci.local/input/conan/conan-win_0_12_0.exe $installer +Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" +& $installer /DIR=C:\Utils\Conan /VERYSILENT -- cgit v1.2.3 From 78a764ee65b1b380b73e1800bfeda54598aa4c8b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 14 Sep 2016 15:57:48 +0300 Subject: Install conan dependencies if there is conanfile.txt for module Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'coin/provisioning/common/conan.ps1') diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 4b4e0726..355e0f18 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -5,3 +5,29 @@ $installer = "c:\users\qt\downloads\conan-win_0_12_0.exe" Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-win_0_12_0.exe http://ci-files01-hki.ci.local/input/conan/conan-win_0_12_0.exe $installer Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT + +function Run-Conan-Install +{ + Param ( + [string]$ConanfilesDir, + [string]$BuildinfoDir, + [string]$Arch, + [string]$Compiler, + [string]$CompilerVersion + ) + + Get-ChildItem -Path "$ConanfilesDir\*.txt" | + ForEach-Object { + $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" + New-Item $outpwd -Type directory -Force + Start-Process ` + "C:\Utils\Conan\conan\conan.exe" ` + -WorkingDirectory $outpwd ` + -ArgumentList "install -i -f $($_.FullName) -g txt -g qmake -g cmake", ` + '-s', ('compiler="' + $Compiler + '"'), ` + "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` + -NoNewWindow -Wait + } + + [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", $BuildinfoDir, "Machine") +} -- cgit v1.2.3 From e1bfa77391fcf3d50f0d9f9375f5d123710395cf Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 16 Sep 2016 21:18:46 +0300 Subject: Do not use qmake and cmake generator automatically for each conanfile Keep conanfiles self-contained. "txt" generator is not going to be used by coin internally, drop it. Task-number: QTQAINFRA-998 Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145 Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/common/conan.ps1') diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 355e0f18..117cdfc6 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -23,7 +23,7 @@ function Run-Conan-Install Start-Process ` "C:\Utils\Conan\conan\conan.exe" ` -WorkingDirectory $outpwd ` - -ArgumentList "install -i -f $($_.FullName) -g txt -g qmake -g cmake", ` + -ArgumentList "install -i -f $($_.FullName)", ` '-s', ('compiler="' + $Compiler + '"'), ` "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` -NoNewWindow -Wait -- cgit v1.2.3 From 23d11128396da8362f27d703287600699b5a962c Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sat, 17 Sep 2016 21:04:03 +0300 Subject: Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows Change-Id: I841783122edf82739826cc0a7672d8c809870e97 Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/common/conan.ps1') diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 117cdfc6..6d7cf07b 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -6,6 +6,8 @@ Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-w Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT +[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") + function Run-Conan-Install { Param ( @@ -28,6 +30,4 @@ function Run-Conan-Install "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` -NoNewWindow -Wait } - - [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", $BuildinfoDir, "Machine") } -- cgit v1.2.3 From b0b0c9c471359393697389c870aaaad51dbb022f Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sun, 18 Sep 2016 18:20:45 +0300 Subject: Changed slash direction in CI_CONAN_BUILDINFO_DIR Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2 Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/common/conan.ps1') diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 6d7cf07b..70962a41 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -6,7 +6,7 @@ Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-w Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT -[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") +[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:/Utils/conanbuildinfos", "Machine") function Run-Conan-Install { -- cgit v1.2.3