Skip to content

Commit 5ba8f87

Browse files
memshardedAbrilRBSJean1995Jie-ChengMartin Valgur
authored
(#24320) upgrading crashpad to Conan 2
* upgrading to Conan 2 * clean yaml * removed from config.yml * Cleanup * use tool_requires * wip * (#24282) bump boost dependency * (#23502) (#23474) simdjson/3.9.1: remove unnecessary constraints * (#18680) kealib: migrate to Conan v2 * kealib: migrate to Conan v2 * kealib: transitive_libs=True * kealib: simplify patch * kealib: add v1.5.1 * kealib: bump hdf5 * kealib: add min cppstd check * kealib: require GCC 6+ * kealib: drop v1.4.13 * kealib: bump to 1.5.2 * kealib: bump to 1.4.15 * kealib: fix MSVC lib name * kealib: bump hdf5 * kealib: fix MSVC library names * kealib: set HDF5_THREADSAFE based on hdf5 option * kealib: restore GCC 5 support Co-authored-by: Uilian Ries <[email protected]> * kealib: fix a recipe bug * kealib: add CMAKE_POLICY_DEFAULT_CMP0077 * kealib: use valid_min_cppstd() * kealib: add cxx_std_11 to test_package * Add missing system lib in windows * Improve invalid config message. --------- Co-authored-by: Uilian Ries <[email protected]> Co-authored-by: Rubén Rincón Blanco <[email protected]> * (#19228) msix: migrate to Conan v2 * msix: migrate to Conan v2 * msix: use OpenSSL v1 * msix: bump deps * msix: fix Clang build issue * msix: fix OpenSSL 3 support * msix: add missing system libs * msix: simplify xml_parser option * msix: Clang 12 is not supported * msix: yaml * msix: test_package cxx_std_14 * (#24296) cpp-httplib: add version 0.16.0 * (#24297) glaze: add version 2.8.1 * (#24106) arrow: fix target names * Use the same CMake target names as upstream * Bugfix * Bugfix * Remove redundant calls to set_property("cmake_target_name") * Revert "Remove redundant calls to set_property("cmake_target_name")" This reverts commit fc113f0. * Bugfix * Bugfix * (#24307) libftp: add version 0.5.1 * (#24298) [sentry-native] Add versions 0.7.5/0.7.6 and remove 0.7.1/0.7.2 * (#24309) glaze: add version 2.8.2 * Update PULL_REQUEST_TEMPLATE.md (#24311) Update PR template: - Mention list of PRs by recipe - Simplify wording around testing locally - request that PRs are motivated and detailed (what/why/how) * (#24308) octo-logger-cpp: fix checksum for 1.12.0 * (#22456) proposal: update dependencies * proposal: update dependencies * Update recipes/proposal/all/conanfile.py * Update recipes/proposal/all/conanfile.py * Update recipes/proposal/all/conanfile.py * proposal: build fewer versions --------- Co-authored-by: Luis Caro Campos <[email protected]> * (#18949) userspace-rcu: migrate to Conan v2 * userspace-rcu: migrate to Conan v2 * userspace-rcu: add v0.14.0 * userspace-rcu: no need for a custom bootstrap script * userspace-rcu: fix test_v1_package * userspace-rcu: disable apple-clang for v0.11.4 * (#18986) librhash: migrate to Conan v2 * librhash: migrate to Conan v2 * librhash: use OpenSSL v1 * librhash: bump deps * librhash: fix installation * librhash: downgrade OpenSSL * librhash: switch to custom CMakeLists.txt The build scripts in the project are quite non-standard and not too portable. Based on rhash/RHash#103 * librhash: bump openssl * librhash: add v1.4.4 * librhash: fix the list of sources used in CMakeLists.txt * librhash: fix missing lib prefix for libs * librhash: don't use PROJECT_NAME * (#18950) pbc: migrate to Conan v2 * pbc: migrate to Conan v2 * pbc: bump gmp * pbc: use winflexbison on Windows * pbc: add transitive_headers=True to gmp * pbc: fix build * pbc: fix apple cross building bug * pbc: transitive_libs=True * pbc: bump deps * pbc: fix configure issue * pbc: fix to_apple_arch() * pbc: add MSVC support * pbc: add AutotoolsDeps workaround for MSVC * pbc: add MSVC ./configure workarounds * pbc: not compatible with MSVC due to use of GNU extensions * pbc: fix_apple_shared_install_name() * (#18948) hiredis/0.x.x: remove 0.x recipe * hiredis/0.x.x: migrate to Conan v2 * hiredis/0.x.x: fix_apple_shared_install_name(self) * Dropped support for very old 0.x.x versions --------- Co-authored-by: PerseoGI <[email protected]> * (#23997) mini: add recipe * mini: add recipe * Update recipes/mini/all/test_package/test_package.cpp --------- Co-authored-by: Luis Caro Campos <[email protected]> * (#24300) octo-logger-cpp: bumped fmt dependency * (#20586) pcre2: fix invalid pcre2-config output for static libs * pcre2: fix invalid pcre2-config output for static libs * pcre2: ignore noise from self.run() * pcre2: make pcre2-config test a bit more robust * pcre2: handle debug postfix correctly * pcre2: no need for win_bash = True * pcre2: drop self.tool_requires(self.tested_reference_str) * Update recipes/pcre2/all/test_package/conanfile.py * Update recipes/pcre2/all/test_package/conanfile.py * Update recipes/pcre2/all/test_package/conanfile.py * Update recipes/pcre2/all/test_package/conanfile.py * Update recipes/pcre2/all/test_package/conanfile.py * Update recipes/pcre2/all/test_package/conanfile.py * fix replace for 10.43 * fix fix replace --------- Co-authored-by: Daniel <[email protected]> * (#19239) pro-mdnsd: migrate to Conan v2 Co-authored-by: Carlos Zoido <[email protected]> * (#24262) reflect-cpp: add option for using with msgpack * reflect-cpp: add option for using with msgpack * reflect-cpp: fix with_msgpack option --------- Co-authored-by: Luis Caro Campos <[email protected]> * (#24011) arrow: add version 16.1.0 * arrow: add version 16.1.0 * Format build method --------- Co-authored-by: PerseoGI <[email protected]> * (#24312) [bot] Update authorized users list (2024-06-13) Co-authored-by: conan-center-bot <[email protected]> * (#24273) [boost] Add -fcoroutines for GCC10 only * Add -fcoroutines for GCC10 only Signed-off-by: Uilian Ries <[email protected]> * Use b2 ranged version Signed-off-by: Uilian Ries <[email protected]> --------- Signed-off-by: Uilian Ries <[email protected]> * (#24318) glaze: add version 2.8.4 * (#24316) jsoncons: add version 0.176.0 * (#24306) libmaxminddb: add version 1.10.0 * libmaxmind: add version 1.10.0 * add with_binaries option * Cleanups * append PATH on with_binaries=True --------- Co-authored-by: Rubén Rincón Blanco <[email protected]> * (#24323) pcre2: add version 10.44 * test pr do not merge * Revert "test pr do not merge" This reverts commit f146b96. * (#24328) change gn validate to validate_build * package license * update to set_property for cmake_build_modules * add library type --------- Signed-off-by: Uilian Ries <[email protected]> Co-authored-by: Rubén Rincón Blanco <[email protected]> Co-authored-by: Jean-Marco Alameddine <[email protected]> Co-authored-by: Jie Cheng <[email protected]> Co-authored-by: Martin Valgur <[email protected]> Co-authored-by: Uilian Ries <[email protected]> Co-authored-by: toge <[email protected]> Co-authored-by: Roberto Rossini <[email protected]> Co-authored-by: Martin Delille <[email protected]> Co-authored-by: Luis Caro Campos <[email protected]> Co-authored-by: PerseoGI <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: Carlos Zoido <[email protected]> Co-authored-by: Beartama <[email protected]> Co-authored-by: Conan Center Index Bot <[email protected]> Co-authored-by: conan-center-bot <[email protected]>
1 parent 3e8615e commit 5ba8f87

11 files changed

+125
-421
lines changed

recipes/crashpad/all/conandata.yml

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
sources:
2-
"cci.20210507":
3-
crashpad:
4-
url: "https://github.com/chromium/crashpad/archive/d9bc7cf06aef74e928f9afc3dee33b60121b9c73.tar.gz"
5-
sha256: "49f4b10f1de9b6d33743eccecace6b0fc9d7fe92e5e550ba5e099e6db9a11f0f"
6-
mini_chromium:
7-
url: "https://github.com/chromium/mini_chromium/archive/ccb198907cecf072d8f5b2543d4d348e834a298a.tar.gz"
8-
sha256: "f40a77a4580cd1cb9af71602917a0e85b62bf0f74641b6ed81dd9fb2f2012ea9"
92
"cci.20220219":
103
crashpad:
114
url: "https://github.com/chromium/crashpad/archive/e9937cb36cd12f24d73a07c4b91168cf1885b5db.tar.gz"
@@ -14,36 +7,13 @@ sources:
147
url: "https://github.com/chromium/mini_chromium/archive/822fada4a9972e3e2f36a981da770539025beb0a.tar.gz"
158
sha256: "2c3bf30d324fcb60eeef84dd6aaf7fb75b70e37bdb3716ab3ea10cda51c4b05c"
169
patches:
17-
"cci.20210507":
18-
- patch_file: "patches/cci.20210507-0001-fix-openssl-link-order.patch"
19-
base_path: "source_subfolder"
20-
- patch_file: "patches/cci.20210507-0002-remove-fPIC-Werror-LTO.patch"
21-
base_path: "source_subfolder"
22-
- patch_file: "patches/cci.20210507-0003-compilers-from-env.patch"
23-
base_path: "source_subfolder"
24-
- patch_file: "patches/cci.20210507-0004-use-conan-linux-syscall-support-package.patch"
25-
base_path: "source_subfolder"
26-
- patch_file: "patches/cci.20210507-0005-allow-all-archs.patch"
27-
base_path: "source_subfolder"
28-
- patch_file: "patches/cci.20210507-0006-mini_chromium-win_helper-py3.patch"
29-
base_path: "source_subfolder"
30-
- patch_file: "patches/cci.20210507-0007-use-system-zlib.patch"
31-
base_path: "source_subfolder"
3210
"cci.20220219":
3311
- patch_file: "patches/cci.20220219-0001-fix-openssl-link-order.patch"
34-
base_path: "source_subfolder"
3512
- patch_file: "patches/cci.20220219-0002-remove-fPIC-Werror-LTO.patch"
36-
base_path: "source_subfolder"
3713
- patch_file: "patches/cci.20220219-0003-compilers-from-env.patch"
38-
base_path: "source_subfolder"
3914
- patch_file: "patches/cci.20220219-0004-use-conan-linux-syscall-support-package.patch"
40-
base_path: "source_subfolder"
4115
- patch_file: "patches/cci.20220219-0005-allow-all-archs.patch"
42-
base_path: "source_subfolder"
4316
- patch_file: "patches/cci.20220219-0006-mini_chromium-win_helper-py3.patch"
44-
base_path: "source_subfolder"
45-
# reused patch from cci.20210507
17+
# reused patch from cci.20210507
4618
- patch_file: "patches/cci.20210507-0007-use-system-zlib.patch"
47-
base_path: "source_subfolder"
4819
- patch_file: "patches/cci.20220219-0007-static-lib-tool_support.patch"
49-
base_path: "source_subfolder"

recipes/crashpad/all/conanfile.py

Lines changed: 94 additions & 114 deletions
Large diffs are not rendered by default.

recipes/crashpad/all/patches/cci.20210507-0001-fix-openssl-link-order.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

recipes/crashpad/all/patches/cci.20210507-0002-remove-fPIC-Werror-LTO.patch

Lines changed: 0 additions & 70 deletions
This file was deleted.

recipes/crashpad/all/patches/cci.20210507-0003-compilers-from-env.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

recipes/crashpad/all/patches/cci.20210507-0004-use-conan-linux-syscall-support-package.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

recipes/crashpad/all/patches/cci.20210507-0005-allow-all-archs.patch

Lines changed: 0 additions & 40 deletions
This file was deleted.

recipes/crashpad/all/patches/cci.20210507-0006-mini_chromium-win_helper-py3.patch

Lines changed: 0 additions & 96 deletions
This file was deleted.
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
cmake_minimum_required(VERSION 3.1)
2-
project(test_package)
1+
cmake_minimum_required(VERSION 3.15)
2+
project(test_package LANGUAGES CXX)
33

4-
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
5-
conan_basic_setup()
4+
find_package(crashpad REQUIRED CONFIG)
65

76
add_executable(${PROJECT_NAME} test_package.cpp)
8-
target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
7+
target_link_libraries(${PROJECT_NAME} PRIVATE crashpad::crashpad)
98
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)
Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,39 @@
1-
from conans import ConanFile, CMake, tools
1+
from conan import ConanFile
2+
from conan.tools.build import can_run
3+
from conan.tools.cmake import cmake_layout, CMake
4+
from conan.tools.files import mkdir, save, load
25
import os
36

47

58
class TestPackageConan(ConanFile):
6-
settings = "os", "compiler", "build_type", "arch"
7-
generators = "cmake"
9+
settings = "os", "arch", "compiler", "build_type"
10+
generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
11+
test_type = "explicit"
12+
13+
def requirements(self):
14+
self.requires(self.tested_reference_str)
15+
16+
def layout(self):
17+
cmake_layout(self)
18+
19+
def generate(self):
20+
save(self, os.path.join(self.generators_folder, "bindir"),
21+
os.path.join(self.dependencies["crashpad"].package_folder, "bin"))
822

923
def build(self):
1024
cmake = CMake(self)
1125
cmake.configure()
1226
cmake.build()
1327

1428
def test(self):
15-
if not tools.cross_building(self):
29+
if can_run(self):
1630
test_env_dir = "test_env"
17-
tools.mkdir(test_env_dir)
18-
bin_path = os.path.join("bin", "test_package")
19-
handler_exe = "crashpad_handler.exe" if self.settings.os == "Windows" else "crashpad_handler"
20-
handler_bin_path = os.path.join(self.deps_cpp_info["crashpad"].rootpath, "bin", handler_exe)
21-
self.run("%s %s/db %s" % (bin_path, test_env_dir, handler_bin_path), run_environment=True)
31+
mkdir(self, test_env_dir)
32+
bin_path = os.path.join(self.cpp.build.bindir, "test_package")
33+
bindir = load(self, os.path.join(self.generators_folder, "bindir"))
34+
handler_exe = "crashpad_handler" + (".exe" if self.settings.os == "Windows" else "")
35+
handler_bin_path = os.path.join(bindir, handler_exe)
36+
self.run(f"{bin_path} {test_env_dir}/db {handler_bin_path}", env="conanrun")
2237
if self.settings.os == "Windows":
23-
handler_exe = "crashpad_handler.com"
24-
handler_bin_path = os.path.join(self.deps_cpp_info["crashpad"].rootpath, "bin", handler_exe)
25-
self.run("%s %s/db %s" % (bin_path, test_env_dir, handler_bin_path), run_environment=True)
38+
handler_bin_path = os.path.join(bindir, "crashpad_handler.com")
39+
self.run(f"{bin_path} {test_env_dir}/db {handler_bin_path}", env="conanrun")

0 commit comments

Comments
 (0)