fast-cdr: dont publish new revisions for older versions (#28118)

* fast-cdr: dont publish new revisions for older versions

* remove patches folder

Author: jcar87

recipes/fast-cdr/all/conandata.yml

@@ -2,27 +2,6 @@ sources:
   "2.2.5":
     url: "https://github.com/eProsima/Fast-CDR/archive/v2.2.5.tar.gz"
     sha256: "b01fd34135e9be5183bb69f31fa5b74c53ba6eca30a5b21de0120d21ece22a51"
-  "2.2.3":
-    url: "https://github.com/eProsima/Fast-CDR/archive/v2.2.3.tar.gz"
-    sha256: "2501ef0930727d3b3ac1819672a6df8631a58fbcf7f005947046c2de46e8da69"
-  "2.2.0":
-    url: "https://github.com/eProsima/Fast-CDR/archive/v2.2.0.tar.gz"
-    sha256: "8a75ee3aed59f495e95208050920d2c2146df92f073809505a3bd29011c21f20"
   "2.1.0":
     url: "https://github.com/eProsima/Fast-CDR/archive/v2.1.0.tar.gz"
     sha256: "7ee3b3e977381f76f8d9ab1e1df7b5202556505b104afb3f03ee79bbe6507aa0"
-  "2.0.0":
-    url: "https://github.com/eProsima/Fast-CDR/archive/v2.0.0.tar.gz"
-    sha256: "66234a5504879f7af706530996177df930d61dd88045dcafb73799458413ee93"
-  "1.1.0":
-    url: "https://github.com/eProsima/Fast-CDR/archive/v1.1.0.tar.gz"
-    sha256: "5c4b2ad5493abd30b9475b14856641a8944c98077a36bd0760c1d83c65216e67"
-  "1.0.27":
-    url: "https://github.com/eProsima/Fast-CDR/archive/v1.0.27.tar.gz"
-    sha256: "a9bc8fd31a2c2b95e6d2fb46e6ce1ad733e86dc4442f733479e33ed9cdc54bf6"
-patches:
-  "2.0.0":
-    - patch_file: "patches/2.0.0-0001-Fix-for-non-CWG-1270-revision-compliant-compilers-17.patch"
-      patch_type: "portability"
-      patch_description: "Fix for non CWG 1270 revision compliant compilers"
-      patch_source: "https://github.com/eProsima/Fast-CDR/pull/173"

recipes/fast-cdr/all/conanfile.py

@@ -2,13 +2,11 @@
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.build import check_min_cppstd
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
-from conan.tools.files import apply_conandata_patches, collect_libs, copy, export_conandata_patches, get, rm, rmdir, save
+from conan.tools.files import collect_libs, copy, get, rm, rmdir
 from conan.tools.microsoft import is_msvc, is_msvc_static_runtime
-from conan.tools.scm import Version
 import os
-import textwrap
 
-required_conan_version = ">=1.54.0"
+required_conan_version = ">=2.2"
 
 
 class FastCDRConan(ConanFile):
@@ -30,33 +28,23 @@ class FastCDRConan(ConanFile):
         "fPIC": True,
     }
 
-    def export_sources(self):
-        export_conandata_patches(self)
-
-    def config_options(self):
-        if self.settings.os == "Windows":
-            del self.options.fPIC
-
-    def configure(self):
-        if self.options.shared:
-            self.options.rm_safe("fPIC")
+    implements = ["auto_shared_fpic"]
 
     def layout(self):
         cmake_layout(self, src_folder="src")
 
     def build_requirements(self):
-        if Version(self.version) >= "1.1.0":
-            self.tool_requires("cmake/[>=3.16.3 <4]")
+        self.tool_requires("cmake/[>=3.16.3]")
 
     def validate(self):
-        if self.settings.compiler.get_safe("cppstd"):
-            check_min_cppstd(self, 11)
+        check_min_cppstd(self, 11)
+
         if self.options.shared and is_msvc(self) and is_msvc_static_runtime(self):
             # This combination leads to an fast-cdr error when linking
             # linking dynamic '*.dll' and static MT runtime
             # see https://github.com/eProsima/Fast-CDR/blob/v1.0.21/include/fastcdr/eProsima_auto_link.h#L37
             # (2021-05-31)
-            raise ConanInvalidConfiguration("Mixing a dll eprosima library with a static runtime is a bad idea")
+            raise ConanInvalidConfiguration("Windows msvc static runtime is not supported")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
@@ -67,7 +55,6 @@ def generate(self):
         tc.generate()
 
     def build(self):
-        apply_conandata_patches(self)
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
@@ -81,27 +68,6 @@ def package(self):
         rm(self, "*.pdb", os.path.join(self.package_folder, "lib"))
         rm(self, "*.pdb", os.path.join(self.package_folder, "bin"))
 
-        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
-        self._create_cmake_module_alias_targets(
-            os.path.join(self.package_folder, self._module_file_rel_path),
-            {"fastcdr": "fastcdr::fastcdr"}
-        )
-
-    def _create_cmake_module_alias_targets(self, module_file, targets):
-        content = ""
-        for alias, aliased in targets.items():
-            content += textwrap.dedent(f"""\
-                if(TARGET {aliased} AND NOT TARGET {alias})
-                    add_library({alias} INTERFACE IMPORTED)
-                    set_property(TARGET {alias} PROPERTY INTERFACE_LINK_LIBRARIES {aliased})
-                endif()
-            """)
-        save(self, module_file, content)
-
-    @property
-    def _module_file_rel_path(self):
-        return os.path.join("lib", "cmake", f"conan-official-{self.name}-targets.cmake")
-
     def package_info(self):
         self.cpp_info.set_property("cmake_file_name", "fastcdr")
         self.cpp_info.set_property("cmake_target_name", "fastcdr")
@@ -111,9 +77,3 @@ def package_info(self):
 
         if self.settings.os in ["Linux"]:
             self.cpp_info.system_libs.append("m")
-
-        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
-        self.cpp_info.names["cmake_find_package"] = "fastcdr"
-        self.cpp_info.names["cmake_find_package_multi"] = "fastcdr"
-        self.cpp_info.build_modules["cmake_find_package"] = [self._module_file_rel_path]
-        self.cpp_info.build_modules["cmake_find_package_multi"] = [self._module_file_rel_path]

recipes/fast-cdr/all/patches/2.0.0-0001-Fix-for-non-CWG-1270-revision-compliant-compilers-17.patch

@@ -1,15 +1,5 @@
 versions:
   "2.2.5":
     folder: all
-  "2.2.3":
-    folder: all
-  "2.2.0":
-    folder: all
   "2.1.0":
     folder: all
-  "2.0.0":
-    folder: all
-  "1.1.0":
-    folder: all
-  "1.0.27":
-    folder: all