kaitai_struct_cpp_stl_runtime: add version 0.10, support conan v 2

recipes/kaitai_struct_cpp_stl_runtime/all/conandata.yml

@@ -1,4 +1,16 @@
 sources:
+  "0.10":
+    url: "https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime/archive/refs/tags/0.10.tar.gz"
+    sha256: "9a7d382b2acbbe6498ecca23fc7b6b98cbcc418af83fb569f94395f29712171c"
   "cci.20210701":
     url: "https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime/archive/cb09b3a84c7e905c6a3fecfe9617cf864d9af781.zip"
     sha256: "058c01828692bf193cb862372651c572fcc43babbf2d664674409511b9f54e5b"
+patches:
+  "0.10":
+    - patch_file: "patches/0001-cmake-minimum-required.patch"
+      patch_description: "declare cmake_minimum_required first"
+      patch_type: "portability"
+  "cci.20210701":
+    - patch_file: "patches/0001-cmake-minimum-required.patch"
+      patch_description: "declare cmake_minimum_required first"
+      patch_type: "portability"

recipes/kaitai_struct_cpp_stl_runtime/all/conanfile.py

@@ -1,68 +1,64 @@
+from conan import ConanFile
+from conan.tools.files import get, copy, export_conandata_patches, apply_conandata_patches
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 import os
 
-from conans import ConanFile, CMake, tools
-
+required_conan_version = ">=1.53.0"
 
 class KaitaiStructCppStlRuntimeConan(ConanFile):
     name = "kaitai_struct_cpp_stl_runtime"
+    description = "kaitai struct c++ runtime library"
     license = "MIT"
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://kaitai.io/"
-    description = "kaitai struct c++ runtime library"
-    topics = ("parsers", "streams", "dsl")
-    settings = "os", "compiler", "build_type", "arch"
-    exports_sources = "CMakeLists.txt"
-    generators = "cmake"
+    topics = ("parsers", "streams", "dsl", "kaitai struct")
+    settings = "os", "arch", "compiler", "build_type"
     options = {
         "with_zlib": [True, False],
-        "with_iconv": [True, False]
+        "with_iconv": [True, False],
     }
     default_options = {
         "with_zlib": False,
-        "with_iconv": False
+        "with_iconv": False,
     }
     short_paths = True
-    _cmake = None
+
+    def export_sources(self):
+        export_conandata_patches(self)
+
+    def layout(self):
+        cmake_layout(self, src_folder="src")
 
     def requirements(self):
         if self.options.with_zlib:
-            self.requires("zlib/1.2.11")
+            self.requires("zlib/1.2.13")
         if self.options.with_iconv:
-            self.requires("libiconv/1.16")
-
-    @property
-    def _source_subfolder(self):
-        return "source_subfolder"
-
-    @property
-    def _build_subfolder(self):
-        return "build_subfolder"
+            self.requires("libiconv/1.17")
 
     def source(self):
-        tools.get(**self.conan_data["sources"][self.version],
-                  destination=self._source_subfolder, strip_root=True)
-
-    def build(self):
-        cmake = self._configure_cmake()
-        cmake.build()
-
-    def _configure_cmake(self):
-        if self._cmake:
-            return self._cmake
-        self._cmake = CMake(self)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
+    def generate(self):
+        tc = CMakeToolchain(self)
         if self.options.with_iconv:
-            self._cmake.definitions["STRING_ENCODING_TYPE"] = "ICONV"
+            tc.variables["STRING_ENCODING_TYPE"] = "ICONV"
         else:
-            self._cmake.definitions["STRING_ENCODING_TYPE"] = "NONE"
+            tc.variables["STRING_ENCODING_TYPE"] = "NONE"
+        tc.generate()
 
-        self._cmake.configure(build_folder=self._build_subfolder)
-        return self._cmake
+        deps = CMakeDeps(self)
+        deps.generate()
+
+    def build(self):
+        apply_conandata_patches(self)
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
 
     def package(self):
-        self.copy("LICENSE", dst="licenses", src=self._source_subfolder)
-        cmake = self._configure_cmake()
+        copy(self, pattern="LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
+        cmake = CMake(self)
         cmake.install()
 
     def package_info(self):
-        self.cpp_info.libs = tools.collect_libs(self)
+        self.cpp_info.libs = ["kaitai_struct_cpp_stl_runtime"]

recipes/kaitai_struct_cpp_stl_runtime/all/patches/0001-cmake-minimum-required.patch

@@ -0,0 +1,11 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7f72825..fa3d4e4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+-project (kaitai_struct_cpp_stl_runtime CXX)
+ cmake_minimum_required (VERSION 3.3)
++project (kaitai_struct_cpp_stl_runtime CXX)
+
+ set (CMAKE_INCLUDE_CURRENT_DIR ON)
+

recipes/kaitai_struct_cpp_stl_runtime/all/test_package/CMakeLists.txt

@@ -1,9 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
-project(PackageTest CXX)
+project(test_package LANGUAGES CXX)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
-
-add_executable(test_package test_package.cpp)
-target_link_libraries(test_package ${CONAN_LIBS})
+find_package(kaitai_struct_cpp_stl_runtime REQUIRED CONFIG)
 
+add_executable(${PROJECT_NAME} test_package.cpp)
+target_link_libraries(${PROJECT_NAME} PRIVATE kaitai_struct_cpp_stl_runtime::kaitai_struct_cpp_stl_runtime)

recipes/kaitai_struct_cpp_stl_runtime/all/test_package/conanfile.py

@@ -1,17 +1,26 @@
-from conans import ConanFile, CMake, tools
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import cmake_layout, CMake
 import os
 
 
 class TestPackageConan(ConanFile):
-    settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake"
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def layout(self):
+        cmake_layout(self)
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self.settings):
-            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")

recipes/kaitai_struct_cpp_stl_runtime/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/)

recipes/kaitai_struct_cpp_stl_runtime/all/test_v1_package/conanfile.py

@@ -0,0 +1,18 @@
+from conans import ConanFile, CMake
+from conan.tools.build import cross_building
+import os
+
+
+class TestPackageV1Conan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "cmake", "cmake_find_package_multi"
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if not cross_building(self):
+            bin_path = os.path.join("bin", "test_package")
+            self.run(bin_path, run_environment=True)

recipes/kaitai_struct_cpp_stl_runtime/config.yml

@@ -1,3 +1,5 @@
 versions:
+  "0.10":
+    folder: all
   "cci.20210701":
     folder: all