From a96119c1215e3409c85391e90a5b7827cd95d496 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 6 Jul 2017 14:26:44 +0300 Subject: [PATCH] Provisioning: move Conan manifests to common directory We need to use x86 packages from qtci-windows-10-x86_64 configuration, so splitting Conan manifests by configuration is not a good idea anymore. Task-number: QTBUG-61829 Change-Id: I8b2fc00865cce372ca6b5ec75b4775d345d0d18f Reviewed-by: Simon Hausmann --- coin/provisioning/common/03-conan.ps1 | 3 ++- .../icu/57.1/annulen/stable/export/conanmanifest.txt | 0 .../df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt | 0 .../icu/57.1/vitallium/stable/export/conanmanifest.txt | 0 .../08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt | 0 .../c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt | 0 .../libxml2/2.9.4/annulen/stable/export/conanmanifest.txt | 0 .../357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt | 0 .../libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt | 0 .../0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt | 0 .../95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt | 0 .../libxslt/1.1.29/annulen/stable/export/conanmanifest.txt | 0 .../30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt | 0 .../libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt | 0 .../19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt | 0 .../466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt | 0 .../zlib/1.2.8/annulen/stable/export/conanmanifest.txt | 0 .../a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt | 0 .../icu/57.1/vitallium/stable/export/conanmanifest.txt | 2 -- .../libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt | 2 -- .../libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt | 2 -- 21 files changed, 2 insertions(+), 7 deletions(-) rename coin/provisioning/{qtci-windows-7-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/icu/57.1/annulen/stable/export/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-7-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-10-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/icu/57.1/vitallium/stable/export/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-10-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests => common/conan_manifests}/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-7-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-7-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-10-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-10-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests => common/conan_manifests}/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-7-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-7-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-10-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests => common/conan_manifests}/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-10-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-7-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/zlib/1.2.8/annulen/stable/export/conanmanifest.txt (100%) rename coin/provisioning/{qtci-windows-7-x86/conanfiles/qtwebkit.manifests => common/conan_manifests}/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt (100%) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 6a4b4ebb..f281e6e0 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -32,11 +32,12 @@ function Run-Conan-Install $extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)" } + $manifestsDir = "$PSScriptRoot\conan_manifests" + Get-ChildItem -Path "$ConanfilesDir\*.txt" | ForEach-Object { $conanfile = $_.FullName $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" - $manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests" New-Item $outpwd -Type directory -Force $process = Start-Process-Logged ` diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/icu/57.1/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/icu/57.1/annulen/stable/export/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/icu/57.1/vitallium/stable/package/08d619707be406a9063a13de35af19767e64a982/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt b/coin/provisioning/common/conan_manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/icu/57.1/vitallium/stable/package/c4195ae4643996fbb226d1e0265076354ac622bb/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/0de2434f61f19881f1d4cfe60c583be521a65d08/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/95a4a855074d4607ef02a5a86bf5ef1666dd773e/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt b/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt b/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt rename to coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt deleted file mode 100644 index 392eb24f..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -1482492127 -conanfile.py: 7edc28cf26a4c3acd9b1c9f08ea8cba3 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt deleted file mode 100644 index c958bb87..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -1482493404 -conanfile.py: 4c879159bebcecec85173f085cd4c3c7 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt deleted file mode 100644 index be77d721..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -1478438034 -conanfile.py: 2472a82109b2d59062d3e50a54d08a4a