From 33d58085c1764aebad602eab20b77682cd3e12b8 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Wed, 14 Dec 2022 03:25:05 +0100 Subject: [PATCH] (#14700) bitserializer: conan v2 support --- recipes/bitserializer/all/conanfile.py | 84 +++++++++++-------- .../all/test_package/CMakeLists.txt | 7 +- .../all/test_package/conanfile.py | 29 +++++-- .../all/test_v1_package/CMakeLists.txt | 8 ++ .../all/test_v1_package/conanfile.py | 20 +++++ 5 files changed, 98 insertions(+), 50 deletions(-) create mode 100644 recipes/bitserializer/all/test_v1_package/CMakeLists.txt create mode 100644 recipes/bitserializer/all/test_v1_package/conanfile.py diff --git a/recipes/bitserializer/all/conanfile.py b/recipes/bitserializer/all/conanfile.py index aae9752385..cf88fcf1ae 100644 --- a/recipes/bitserializer/all/conanfile.py +++ b/recipes/bitserializer/all/conanfile.py @@ -1,8 +1,12 @@ -from conans import ConanFile, tools -from conans.errors import ConanInvalidConfiguration +from conan import ConanFile +from conan.errors import ConanInvalidConfiguration +from conan.tools.build import check_min_cppstd +from conan.tools.files import copy, get +from conan.tools.layout import basic_layout +from conan.tools.scm import Version import os -required_conan_version = ">=1.43.0" +required_conan_version = ">=1.50.0" class BitserializerConan(ConanFile): @@ -28,86 +32,92 @@ class BitserializerConan(ConanFile): no_copy_source = True @property - def _supported_compilers(self): - if tools.Version(self.version) >= "0.44": - return { - "gcc": "8", - "clang": "8", - "Visual Studio": "15", - "apple-clang": "12", - } + def _min_cppstd(self): + return "17" + @property + def _compilers_minimum_version(self): return { "gcc": "8", - "clang": "7", + "clang": "7" if Version(self.version) < "0.44" else "8", "Visual Studio": "15", + "msvc": "191", "apple-clang": "12", } - @property - def _source_subfolder(self): - return "source_subfolder" + def layout(self): + basic_layout(self, src_folder="src") def requirements(self): if self.options.with_cpprestsdk: - self.requires("cpprestsdk/2.10.18") + self.requires("cpprestsdk/2.10.18", transitive_headers=True, transitive_libs=True) if self.options.with_rapidjson: - self.requires("rapidjson/cci.20211112") + self.requires("rapidjson/cci.20220514", transitive_headers=True, transitive_libs=True) if self.options.with_pugixml: - self.requires("pugixml/1.11") + self.requires("pugixml/1.13", transitive_headers=True, transitive_libs=True) + + def package_id(self): + self.info.clear() def validate(self): - # Check compiler for supporting C++ 17 if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, "17") - try: - minimum_required_compiler_version = self._supported_compilers[str(self.settings.compiler)] - if tools.Version(self.settings.compiler.version) < minimum_required_compiler_version: - raise ConanInvalidConfiguration("This package requires c++17 support. The current compiler does not support it.") - except KeyError: - self.output.warn("This recipe has no support for the current compiler. Please consider adding it.") + check_min_cppstd(self, self._min_cppstd) + + minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False) + if minimum_version and Version(self.settings.compiler.version) < minimum_version: + raise ConanInvalidConfiguration( + f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support.", + ) # Check stdlib ABI compatibility compiler_name = str(self.settings.compiler) if compiler_name == "gcc" and self.settings.compiler.libcxx != "libstdc++11": - raise ConanInvalidConfiguration('Using %s with GCC requires "compiler.libcxx=libstdc++11"' % self.name) + raise ConanInvalidConfiguration(f'Using {self.ref} with GCC requires "compiler.libcxx=libstdc++11"') elif compiler_name == "clang" and self.settings.compiler.libcxx not in ["libstdc++11", "libc++"]: - raise ConanInvalidConfiguration('Using %s with Clang requires either "compiler.libcxx=libstdc++11"' - ' or "compiler.libcxx=libc++"' % self.name) - - def package_id(self): - self.info.header_only() + raise ConanInvalidConfiguration(f'Using {self.ref} with Clang requires either "compiler.libcxx=libstdc++11"' + ' or "compiler.libcxx=libc++"') def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) + get(self, **self.conan_data["sources"][self.version], + destination=self.source_folder, strip_root=True) + + def build(self): + pass def package(self): - self.copy(pattern="license.txt", dst="licenses", src=self._source_subfolder) - self.copy(pattern="*.h", dst="include", src=os.path.join(self._source_subfolder, "include")) + copy(self, "license.txt", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses")) + copy(self, "*.h", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include")) def package_info(self): self.cpp_info.set_property("cmake_file_name", "bitserializer") # cpprestjson-core self.cpp_info.components["bitserializer-core"].set_property("cmake_target_name", "BitSerializer::core") + self.cpp_info.components["bitserializer-core"].bindirs = [] + self.cpp_info.components["bitserializer-core"].libdirs = [] if self.settings.compiler == "gcc" or (self.settings.os == "Linux" and self.settings.compiler == "clang"): - if tools.Version(self.settings.compiler.version) < 9: + if Version(self.settings.compiler.version) < 9: self.cpp_info.components["bitserializer-core"].system_libs = ["stdc++fs"] # cpprestjson-archive if self.options.with_cpprestsdk: self.cpp_info.components["bitserializer-cpprestjson"].set_property("cmake_target_name", "BitSerializer::cpprestjson-archive") + self.cpp_info.components["bitserializer-cpprestjson"].bindirs = [] + self.cpp_info.components["bitserializer-cpprestjson"].libdirs = [] self.cpp_info.components["bitserializer-cpprestjson"].requires = ["bitserializer-core", "cpprestsdk::cpprestsdk"] # rapidjson-archive if self.options.with_rapidjson: self.cpp_info.components["bitserializer-rapidjson"].set_property("cmake_target_name", "BitSerializer::rapidjson-archive") + self.cpp_info.components["bitserializer-rapidjson"].bindirs = [] + self.cpp_info.components["bitserializer-rapidjson"].libdirs = [] self.cpp_info.components["bitserializer-rapidjson"].requires = ["bitserializer-core", "rapidjson::rapidjson"] # pugixml-archive if self.options.with_pugixml: self.cpp_info.components["bitserializer-pugixml"].set_property("cmake_target_name", "BitSerializer::pugixml-archive") + self.cpp_info.components["bitserializer-pugixml"].bindirs = [] + self.cpp_info.components["bitserializer-pugixml"].libdirs = [] self.cpp_info.components["bitserializer-pugixml"].requires = ["bitserializer-core", "pugixml::pugixml"] # TODO: to remove in conan v2 once cmake_find_package* generators removed diff --git a/recipes/bitserializer/all/test_package/CMakeLists.txt b/recipes/bitserializer/all/test_package/CMakeLists.txt index 920aede311..7f25cd9716 100644 --- a/recipes/bitserializer/all/test_package/CMakeLists.txt +++ b/recipes/bitserializer/all/test_package/CMakeLists.txt @@ -1,14 +1,11 @@ cmake_minimum_required(VERSION 3.8) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) +project(test_package LANGUAGES CXX) find_package(bitserializer REQUIRED CONFIG) add_executable(${PROJECT_NAME} test_package.cpp) target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) -target_link_libraries(${PROJECT_NAME} +target_link_libraries(${PROJECT_NAME} PRIVATE BitSerializer::core $<$:BitSerializer::cpprestjson-archive> $<$:BitSerializer::rapidjson-archive> diff --git a/recipes/bitserializer/all/test_package/conanfile.py b/recipes/bitserializer/all/test_package/conanfile.py index 2aef261cc5..4076e2a9b6 100644 --- a/recipes/bitserializer/all/test_package/conanfile.py +++ b/recipes/bitserializer/all/test_package/conanfile.py @@ -1,20 +1,33 @@ -from conans import ConanFile, CMake, tools +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout import os class TestPackageConan(ConanFile): settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" + generators = "CMakeDeps", "VirtualRunEnv" + test_type = "explicit" + + def layout(self): + cmake_layout(self) + + def requirements(self): + self.requires(self.tested_reference_str) + + def generate(self): + tc = CMakeToolchain(self) + tc.variables["WITH_CPPRESTSDK"] = self.dependencies["bitserializer"].options.with_cpprestsdk + tc.variables["WITH_RAPIDJSON"] = self.dependencies["bitserializer"].options.with_rapidjson + tc.variables["WITH_PUGIXML"] = self.dependencies["bitserializer"].options.with_pugixml + tc.generate() def build(self): cmake = CMake(self) - cmake.definitions["WITH_CPPRESTSDK"] = self.options["bitserializer"].with_cpprestsdk - cmake.definitions["WITH_RAPIDJSON"] = self.options["bitserializer"].with_rapidjson - cmake.definitions["WITH_PUGIXML"] = self.options["bitserializer"].with_pugixml cmake.configure() cmake.build() def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package") + self.run(bin_path, env="conanrun") diff --git a/recipes/bitserializer/all/test_v1_package/CMakeLists.txt b/recipes/bitserializer/all/test_v1_package/CMakeLists.txt new file mode 100644 index 0000000000..0d20897301 --- /dev/null +++ b/recipes/bitserializer/all/test_v1_package/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.1) +project(test_package) + +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +conan_basic_setup(TARGETS) + +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package + ${CMAKE_CURRENT_BINARY_DIR}/test_package) diff --git a/recipes/bitserializer/all/test_v1_package/conanfile.py b/recipes/bitserializer/all/test_v1_package/conanfile.py new file mode 100644 index 0000000000..2aef261cc5 --- /dev/null +++ b/recipes/bitserializer/all/test_v1_package/conanfile.py @@ -0,0 +1,20 @@ +from conans import ConanFile, CMake, tools +import os + + +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "cmake", "cmake_find_package_multi" + + def build(self): + cmake = CMake(self) + cmake.definitions["WITH_CPPRESTSDK"] = self.options["bitserializer"].with_cpprestsdk + cmake.definitions["WITH_RAPIDJSON"] = self.options["bitserializer"].with_rapidjson + cmake.definitions["WITH_PUGIXML"] = self.options["bitserializer"].with_pugixml + cmake.configure() + cmake.build() + + def test(self): + if not tools.cross_building(self): + bin_path = os.path.join("bin", "test_package") + self.run(bin_path, run_environment=True)