Skip to content

Commit

Permalink
(#24320) upgrading crashpad to Conan 2
Browse files Browse the repository at this point in the history
* 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 <uilianries@gmail.com>

* 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 <uilianries@gmail.com>
Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* (#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 <3535649+jcar87@users.noreply.github.com>

* (#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 <perseog@jfrog.com>

* (#23997) mini: add recipe

* mini: add recipe

* Update recipes/mini/all/test_package/test_package.cpp

---------

Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>

* (#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 <danimanzaneque@gmail.com>

* (#19239) pro-mdnsd: migrate to Conan v2

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* (#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 <3535649+jcar87@users.noreply.github.com>

* (#24011) arrow: add version 16.1.0

* arrow: add version 16.1.0

* Format build method

---------

Co-authored-by: PerseoGI <perseog@jfrog.com>

* (#24312) [bot] Update authorized users list (2024-06-13)

Co-authored-by: conan-center-bot <luism+c3ibot@jfrog.com>

* (#24273) [boost] Add -fcoroutines for GCC10 only

* Add -fcoroutines for GCC10 only

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Use b2 ranged version

Signed-off-by: Uilian Ries <uilianries@gmail.com>

---------

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* (#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 <git@rinconblanco.es>

* (#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 <uilianries@gmail.com>
Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
Co-authored-by: Jean-Marco Alameddine <jean-marco.alameddine@udo.edu>
Co-authored-by: Jie Cheng <chengjiehust@gmail.com>
Co-authored-by: Martin Valgur <martin.valgur@gmail.com>
Co-authored-by: Uilian Ries <uilianries@gmail.com>
Co-authored-by: toge <toge.mail@gmail.com>
Co-authored-by: Roberto Rossini <71787608+robomics@users.noreply.github.com>
Co-authored-by: Martin Delille <martin@delille.org>
Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
Co-authored-by: PerseoGI <perseog@jfrog.com>
Co-authored-by: Daniel <danimanzaneque@gmail.com>
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Co-authored-by: Beartama <8091245+uyha@users.noreply.github.com>
Co-authored-by: Conan Center Index Bot <54393557+conan-center-bot@users.noreply.github.com>
Co-authored-by: conan-center-bot <luism+c3ibot@jfrog.com>
  • Loading branch information
16 people authored Jun 17, 2024
1 parent 3e8615e commit 5ba8f87
Show file tree
Hide file tree
Showing 11 changed files with 125 additions and 421 deletions.
32 changes: 1 addition & 31 deletions recipes/crashpad/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -14,36 +7,13 @@ sources:
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"
208 changes: 94 additions & 114 deletions recipes/crashpad/all/conanfile.py

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

9 changes: 4 additions & 5 deletions recipes/crashpad/all/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
38 changes: 26 additions & 12 deletions recipes/crashpad/all/test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 0 additions & 2 deletions recipes/crashpad/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
versions:
"cci.20210507":
folder: all
"cci.20220219":
folder: all

0 comments on commit 5ba8f87

Please sign in to comment.