diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2019-07-26 18:57:59 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-07-26 19:52:45 +0300 |
commit | 716640a4770c8e11ab5f6e6ebb8db64868c2679b (patch) | |
tree | a706c8e592f629a87cb99c72171409a8207319a6 /coin/provisioning/qtci-windows-7-x86 | |
parent | 4bf0ba2ba18e0caf2e4e99ab68a1f506a9eb3705 (diff) |
Provisioning: update Conan and Conan packages
[*] Update Conan to 1.17.0, adjust to change in command line arguments
[*] Update Conan packages to up-to-date versions, add libjpeg-turbo and
packages for 64-bit MinGW
[*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after
Python 3 and MinGW
[*] Add license header to conan.ps1
Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86')
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/03-conan.ps1 | 9 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/11-conan.ps1 | 11 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt | 24 |
3 files changed, 28 insertions, 16 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 deleted file mode 100644 index 4aa9658d..00000000 --- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -. "$PSScriptRoot\..\common\windows\conan.ps1" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw53-x86 ` - -Arch x86 ` - -Compiler "gcc" ` - -CompilerVersion "5.3" ` - -CompilerLibcxx "libstdc++11" diff --git a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 new file mode 100644 index 00000000..aa380a09 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir Mingw73-x86 ` + -Arch x86 ` + -Compiler "gcc" ` + -CompilerVersion 7 ` + -CompilerLibcxx "libstdc++" ` + -CompilerException "dwarf2" ` + -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt index 4a5bc05d..7a5a892a 100644 --- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt @@ -1,8 +1,9 @@ [requires] -icu/57.1@annulen/stable -libxml2/2.9.4@annulen/stable -libxslt/1.1.29@annulen/stable -zlib/1.2.8@annulen/stable +icu/64.2@qtproject/stable +libxml2/2.9.9@qtproject/stable +libxslt/1.1.33@qtproject/stable +libjpeg-turbo/2.0.2@qtproject/stable +zlib/1.2.11@qtproject/stable [generators] cmake @@ -10,13 +11,22 @@ txt [options] icu:shared=True +icu:data_packaging=library + libxml2:shared=True +libxml2:iconv=False +libxml2:icu=True +libxml2:zlib=False + libxslt:shared=True + +libjpeg-turbo:shared=False + zlib:shared=False [imports] -lib, icudt57.dll -> ./bin -lib, icuin57.dll -> ./bin -lib, icuuc57.dll -> ./bin +lib, icudt64.dll -> ./bin +lib, icuin64.dll -> ./bin +lib, icuuc64.dll -> ./bin bin, libxml2-2.dll -> ./bin bin, libxslt-1.dll -> ./bin |