From bec6584cb19de072754353e38fe0862826a1f7c3 Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Tue, 15 Mar 2022 14:15:29 +0100 Subject: [PATCH 01/12] Update EVE recipe to take care of the new clang requirement --- recipes/jfalcou-eve/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/jfalcou-eve/all/conanfile.py b/recipes/jfalcou-eve/all/conanfile.py index e4befa8d6daea..40d5a87895af3 100644 --- a/recipes/jfalcou-eve/all/conanfile.py +++ b/recipes/jfalcou-eve/all/conanfile.py @@ -31,7 +31,7 @@ def _compilers_minimum_version(self): return { "gcc": "10.2", "Visual Studio": "16.9", - "clang": "12", + "clang": "13", "apple-clang": "13", } From 603e20fc3b6f529e85128684806a3d756e43cdf8 Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Tue, 15 Mar 2022 14:17:29 +0100 Subject: [PATCH 02/12] Update g++ minimum version --- recipes/jfalcou-eve/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/jfalcou-eve/all/conanfile.py b/recipes/jfalcou-eve/all/conanfile.py index 40d5a87895af3..4e8f4b463de6c 100644 --- a/recipes/jfalcou-eve/all/conanfile.py +++ b/recipes/jfalcou-eve/all/conanfile.py @@ -29,7 +29,7 @@ def _min_cppstd(self): @property def _compilers_minimum_version(self): return { - "gcc": "10.2", + "gcc": "11", "Visual Studio": "16.9", "clang": "13", "apple-clang": "13", From 5340f65da09591895d1b709a0558b7efc3de012f Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Tue, 5 Apr 2022 19:22:44 +0200 Subject: [PATCH 03/12] Add config folder rules --- recipes/jfalcou-eve/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/jfalcou-eve/config.yml b/recipes/jfalcou-eve/config.yml index 0f62a77059506..2b73c8aca38dd 100644 --- a/recipes/jfalcou-eve/config.yml +++ b/recipes/jfalcou-eve/config.yml @@ -3,3 +3,5 @@ versions: folder: all "v2021.10.0": folder: all + "v2022.03.0": + folder: all From f4dc298945b583a77123e1f23f257e334b9a8b12 Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Tue, 5 Apr 2022 19:24:03 +0200 Subject: [PATCH 04/12] Try to deactivate Apple Clang support --- recipes/jfalcou-eve/all/conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/jfalcou-eve/all/conanfile.py b/recipes/jfalcou-eve/all/conanfile.py index 4e8f4b463de6c..566abefe7d6b1 100644 --- a/recipes/jfalcou-eve/all/conanfile.py +++ b/recipes/jfalcou-eve/all/conanfile.py @@ -40,6 +40,8 @@ def validate(self): tools.check_min_cppstd(self, self._min_cppstd) if self.settings.compiler == "Visual Studio": raise ConanInvalidConfiguration("EVE does not support MSVC yet (https://github.com/jfalcou/eve/issues/1022).") + if self.settings.compiler == "apple-clang": + raise ConanInvalidConfiguration("EVE does not support apple Clang due to an incomple libcpp.") def lazy_lt_semver(v1, v2): lv1 = [int(v) for v in v1.split(".")] From 28a42094b6f1bbc5670a2f6f5f99c64bb609bcde Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Thu, 7 Apr 2022 03:01:03 +0200 Subject: [PATCH 05/12] Missing conandata info --- recipes/jfalcou-eve/all/conandata.yml | 3 +++ recipes/jfalcou-eve/all/conanfile.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/jfalcou-eve/all/conandata.yml b/recipes/jfalcou-eve/all/conandata.yml index 64b8f0d735894..14d477c1e37ce 100644 --- a/recipes/jfalcou-eve/all/conandata.yml +++ b/recipes/jfalcou-eve/all/conandata.yml @@ -5,3 +5,6 @@ sources: "v2021.10.0": url: "https://github.com/jfalcou/eve/archive/refs/tags/v2021.10.0.tar.gz" sha256: "580c40a8244039a700b93ea49fb0affc1c8d3c100eb6dc66368e101753f51e5c" + "v2021.10.0": + url: "https://github.com/jfalcou/eve/archive/refs/tags/v2022.03.0.tar.gz" + sha256: "8bf9faea516806e7dd468e778dcedc81c51f0b2c6a70b9c75987ce12bb759911" diff --git a/recipes/jfalcou-eve/all/conanfile.py b/recipes/jfalcou-eve/all/conanfile.py index 566abefe7d6b1..422f059615702 100644 --- a/recipes/jfalcou-eve/all/conanfile.py +++ b/recipes/jfalcou-eve/all/conanfile.py @@ -41,7 +41,7 @@ def validate(self): if self.settings.compiler == "Visual Studio": raise ConanInvalidConfiguration("EVE does not support MSVC yet (https://github.com/jfalcou/eve/issues/1022).") if self.settings.compiler == "apple-clang": - raise ConanInvalidConfiguration("EVE does not support apple Clang due to an incomple libcpp.") + raise ConanInvalidConfiguration("EVE does not support apple Clang due to an incomplete libcpp.") def lazy_lt_semver(v1, v2): lv1 = [int(v) for v in v1.split(".")] From 0019432818c81086ff7dc97cfd83f6eceb952b32 Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Thu, 7 Apr 2022 03:18:06 +0200 Subject: [PATCH 06/12] What about not comittign before coffee --- recipes/jfalcou-eve/all/conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/jfalcou-eve/all/conandata.yml b/recipes/jfalcou-eve/all/conandata.yml index 14d477c1e37ce..ea3ac7198ce51 100644 --- a/recipes/jfalcou-eve/all/conandata.yml +++ b/recipes/jfalcou-eve/all/conandata.yml @@ -5,6 +5,6 @@ sources: "v2021.10.0": url: "https://github.com/jfalcou/eve/archive/refs/tags/v2021.10.0.tar.gz" sha256: "580c40a8244039a700b93ea49fb0affc1c8d3c100eb6dc66368e101753f51e5c" - "v2021.10.0": + "v2022.03.0": url: "https://github.com/jfalcou/eve/archive/refs/tags/v2022.03.0.tar.gz" sha256: "8bf9faea516806e7dd468e778dcedc81c51f0b2c6a70b9c75987ce12bb759911" From db95aedbc6d5a556971f427b03ecb6c8f6f8eee1 Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Tue, 19 Apr 2022 10:23:44 +0200 Subject: [PATCH 07/12] Changes for compiler version --- recipes/jfalcou-eve/all/conanfile.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/recipes/jfalcou-eve/all/conanfile.py b/recipes/jfalcou-eve/all/conanfile.py index 422f059615702..93fba268ec02b 100644 --- a/recipes/jfalcou-eve/all/conanfile.py +++ b/recipes/jfalcou-eve/all/conanfile.py @@ -1,10 +1,8 @@ -from conans import ConanFile, CMake, tools +from conans import ConanFile, tools from conans.errors import ConanInvalidConfiguration -import os required_conan_version = ">=1.33.0" - class JfalcouEveConan(ConanFile): name = "jfalcou-eve" description = ("Expressive Velocity Engine - reimplementation of the old " @@ -28,12 +26,20 @@ def _min_cppstd(self): @property def _compilers_minimum_version(self): - return { - "gcc": "11", - "Visual Studio": "16.9", - "clang": "13", - "apple-clang": "13", - } + if tools.Version(self.version) >= "2022.03.0": + return { + "gcc": "11", + "Visual Studio": "16.9", + "clang": "13", + "apple-clang": "13", + } + else: + return { + "gcc": "10.2", + "Visual Studio": "16.9", + "clang": "12", + "apple-clang": "13", + } def validate(self): if self.settings.compiler.get_safe("cppstd"): From ee79300360a34afbe617712093a3e7b4c8eb7b73 Mon Sep 17 00:00:00 2001 From: SSE4 Date: Fri, 1 Jul 2022 11:20:33 -0700 Subject: [PATCH 08/12] Update recipes/jfalcou-eve/all/conanfile.py --- recipes/jfalcou-eve/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/jfalcou-eve/all/conanfile.py b/recipes/jfalcou-eve/all/conanfile.py index 93fba268ec02b..46c9cc9fbfd52 100644 --- a/recipes/jfalcou-eve/all/conanfile.py +++ b/recipes/jfalcou-eve/all/conanfile.py @@ -26,7 +26,7 @@ def _min_cppstd(self): @property def _compilers_minimum_version(self): - if tools.Version(self.version) >= "2022.03.0": + if not self.version.startswith("cci.") and tools.Version(self.version) >= "2022.03.0": return { "gcc": "11", "Visual Studio": "16.9", From bebb0852aaafc6cc57c673352b69c3c012805a9f Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Thu, 4 Aug 2022 13:12:49 +0200 Subject: [PATCH 09/12] Remove outlier recipe cci.* --- recipes/jfalcou-eve/all/conandata.yml | 3 --- recipes/jfalcou-eve/all/conanfile.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/recipes/jfalcou-eve/all/conandata.yml b/recipes/jfalcou-eve/all/conandata.yml index ea3ac7198ce51..1968e85720cbe 100644 --- a/recipes/jfalcou-eve/all/conandata.yml +++ b/recipes/jfalcou-eve/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "cci.20210823": - url: "https://github.com/jfalcou/eve/archive/30e7a7f6bcc5cf524a6c2cc624234148eee847be.tar.gz" - sha256: "c267135f7215197ef6859b2aa1c5b6a7fc45ca8333933beda56c96b0d0400ef1" "v2021.10.0": url: "https://github.com/jfalcou/eve/archive/refs/tags/v2021.10.0.tar.gz" sha256: "580c40a8244039a700b93ea49fb0affc1c8d3c100eb6dc66368e101753f51e5c" diff --git a/recipes/jfalcou-eve/all/conanfile.py b/recipes/jfalcou-eve/all/conanfile.py index 46c9cc9fbfd52..0cf01e7a95cf7 100644 --- a/recipes/jfalcou-eve/all/conanfile.py +++ b/recipes/jfalcou-eve/all/conanfile.py @@ -26,7 +26,7 @@ def _min_cppstd(self): @property def _compilers_minimum_version(self): - if not self.version.startswith("cci.") and tools.Version(self.version) >= "2022.03.0": + if tools.Version(self.version) >= "2022.03.0": return { "gcc": "11", "Visual Studio": "16.9", From 52f1c37fa62c83e55d5a0dcd950f0771e196d859 Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Thu, 4 Aug 2022 13:20:19 +0200 Subject: [PATCH 10/12] Removed spurrious config --- recipes/jfalcou-eve/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/jfalcou-eve/config.yml b/recipes/jfalcou-eve/config.yml index 2b73c8aca38dd..0190125da41b4 100644 --- a/recipes/jfalcou-eve/config.yml +++ b/recipes/jfalcou-eve/config.yml @@ -1,6 +1,4 @@ versions: - "cci.20210823": - folder: all "v2021.10.0": folder: all "v2022.03.0": From 84f68aa8b544c6b030dfce61d01f14e2bd00e2da Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Fri, 5 Aug 2022 15:25:42 +0200 Subject: [PATCH 11/12] Conan v2 fixes --- recipes/jfalcou-eve/all/conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/jfalcou-eve/all/conanfile.py b/recipes/jfalcou-eve/all/conanfile.py index 0cf01e7a95cf7..d881c726bc9d0 100644 --- a/recipes/jfalcou-eve/all/conanfile.py +++ b/recipes/jfalcou-eve/all/conanfile.py @@ -1,4 +1,4 @@ -from conans import ConanFile, tools +from conan import ConanFile, tools from conans.errors import ConanInvalidConfiguration required_conan_version = ">=1.33.0" @@ -26,7 +26,7 @@ def _min_cppstd(self): @property def _compilers_minimum_version(self): - if tools.Version(self.version) >= "2022.03.0": + if tools.scm.Version(self.version) >= "2022.03.0": return { "gcc": "11", "Visual Studio": "16.9", @@ -43,7 +43,7 @@ def _compilers_minimum_version(self): def validate(self): if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, self._min_cppstd) + tools.build.check_min_cppstd(self, self._min_cppstd) if self.settings.compiler == "Visual Studio": raise ConanInvalidConfiguration("EVE does not support MSVC yet (https://github.com/jfalcou/eve/issues/1022).") if self.settings.compiler == "apple-clang": @@ -65,7 +65,7 @@ def package_id(self): self.info.header_only() def source(self): - tools.get(**self.conan_data["sources"][self.version], strip_root=True, + tools.files.get(**self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder) def package(self): From e559fd40fc095447720316b74072cf05bdfa0682 Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Mon, 8 Aug 2022 11:01:56 +0200 Subject: [PATCH 12/12] Fixed Version issue --- recipes/jfalcou-eve/all/conanfile.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/recipes/jfalcou-eve/all/conanfile.py b/recipes/jfalcou-eve/all/conanfile.py index d881c726bc9d0..552f767f67158 100644 --- a/recipes/jfalcou-eve/all/conanfile.py +++ b/recipes/jfalcou-eve/all/conanfile.py @@ -1,4 +1,5 @@ from conan import ConanFile, tools +from conan.tools.scm import Version from conans.errors import ConanInvalidConfiguration required_conan_version = ">=1.33.0" @@ -26,20 +27,11 @@ def _min_cppstd(self): @property def _compilers_minimum_version(self): - if tools.scm.Version(self.version) >= "2022.03.0": - return { - "gcc": "11", - "Visual Studio": "16.9", - "clang": "13", - "apple-clang": "13", - } - else: - return { - "gcc": "10.2", - "Visual Studio": "16.9", - "clang": "12", - "apple-clang": "13", - } + return {"gcc": "11", + "Visual Studio": "16.9", + "clang": "13", + "apple-clang": "13", + } def validate(self): if self.settings.compiler.get_safe("cppstd"): @@ -65,7 +57,7 @@ def package_id(self): self.info.header_only() def source(self): - tools.files.get(**self.conan_data["sources"][self.version], strip_root=True, + tools.files.get(self, **self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder) def package(self):