upgrading crashpad to Conan 2

recipes/crashpad/all/conandata.yml

@@ -1,11 +1,4 @@
 sources:
-  "cci.20210507":
-    crashpad:
-      url: "https://github.com/chromium/crashpad/archive/d9bc7cf06aef74e928f9afc3dee33b60121b9c73.tar.gz"
-      sha256: "49f4b10f1de9b6d33743eccecace6b0fc9d7fe92e5e550ba5e099e6db9a11f0f"
-    mini_chromium:
-      url: "https://github.com/chromium/mini_chromium/archive/ccb198907cecf072d8f5b2543d4d348e834a298a.tar.gz"
-      sha256: "f40a77a4580cd1cb9af71602917a0e85b62bf0f74641b6ed81dd9fb2f2012ea9"
   "cci.20220219":
     crashpad:
       url: "https://github.com/chromium/crashpad/archive/e9937cb36cd12f24d73a07c4b91168cf1885b5db.tar.gz"
@@ -14,36 +7,13 @@
       url: "https://github.com/chromium/mini_chromium/archive/822fada4a9972e3e2f36a981da770539025beb0a.tar.gz"
       sha256: "2c3bf30d324fcb60eeef84dd6aaf7fb75b70e37bdb3716ab3ea10cda51c4b05c"
 patches:
-  "cci.20210507":
-    - patch_file: "patches/cci.20210507-0001-fix-openssl-link-order.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/cci.20210507-0002-remove-fPIC-Werror-LTO.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/cci.20210507-0003-compilers-from-env.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/cci.20210507-0004-use-conan-linux-syscall-support-package.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/cci.20210507-0005-allow-all-archs.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/cci.20210507-0006-mini_chromium-win_helper-py3.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/cci.20210507-0007-use-system-zlib.patch"
-      base_path: "source_subfolder"
   "cci.20220219":
     - patch_file: "patches/cci.20220219-0001-fix-openssl-link-order.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/cci.20220219-0002-remove-fPIC-Werror-LTO.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/cci.20220219-0003-compilers-from-env.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/cci.20220219-0004-use-conan-linux-syscall-support-package.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/cci.20220219-0005-allow-all-archs.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/cci.20220219-0006-mini_chromium-win_helper-py3.patch"
-      base_path: "source_subfolder"
-      # reused patch from cci.20210507
+    # reused patch from cci.20210507
     - patch_file: "patches/cci.20210507-0007-use-system-zlib.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/cci.20220219-0007-static-lib-tool_support.patch"
-      base_path: "source_subfolder"

recipes/crashpad/all/test_package/CMakeLists.txt

@@ -1,9 +1,8 @@
-cmake_minimum_required(VERSION 3.1)
-project(test_package)
+cmake_minimum_required(VERSION 3.15)
+project(test_package LANGUAGES CXX)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
+find_package(crashpad REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
+target_link_libraries(${PROJECT_NAME} PRIVATE crashpad::crashpad)
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)

recipes/crashpad/all/test_package/conanfile.py

@@ -1,25 +1,39 @@
-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
+from conan.tools.files import mkdir, save, load
 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 generate(self):
+        save(self, os.path.join(self.generators_folder, "bindir"),
+             os.path.join(self.dependencies["crashpad"].package_folder, "bin"))
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self):
+        if can_run(self):
             test_env_dir = "test_env"
-            tools.mkdir(test_env_dir)
-            bin_path = os.path.join("bin", "test_package")
-            handler_exe = "crashpad_handler.exe" if self.settings.os == "Windows" else "crashpad_handler"
-            handler_bin_path = os.path.join(self.deps_cpp_info["crashpad"].rootpath, "bin", handler_exe)
-            self.run("%s %s/db %s" % (bin_path, test_env_dir, handler_bin_path), run_environment=True)
+            mkdir(self, test_env_dir)
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
+            bindir = load(self, os.path.join(self.generators_folder, "bindir"))
+            handler_exe = "crashpad_handler" + (".exe" if self.settings.os == "Windows" else "")
+            handler_bin_path = os.path.join(bindir, handler_exe)
+            self.run(f"{bin_path} {test_env_dir}/db {handler_bin_path}", env="conanrun")
             if self.settings.os == "Windows":
-                handler_exe = "crashpad_handler.com"
-                handler_bin_path = os.path.join(self.deps_cpp_info["crashpad"].rootpath, "bin", handler_exe)
-                self.run("%s %s/db %s" % (bin_path, test_env_dir, handler_bin_path), run_environment=True)
+                handler_bin_path = os.path.join(bindir, "crashpad_handler.com")
+                self.run(f"{bin_path} {test_env_dir}/db {handler_bin_path}", env="conanrun")

recipes/crashpad/config.yml

@@ -1,5 +1,3 @@
 versions:
-  "cci.20210507":
-    folder: all
   "cci.20220219":
     folder: all