Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cpptrace: add version 0.7.1, remove older versions #25257

Merged
merged 2 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 13 additions & 66 deletions recipes/cpptrace/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,85 +1,32 @@
sources:
# Newer versions at the top
"0.7.1":
url: "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.7.1.tar.gz"
sha256: "63df54339feb0c68542232229777df057e1848fc8294528613971bbf42889e83"
"0.7.0":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.7.0.tar.gz"
url: "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.7.0.tar.gz"
sha256: "b5c1fbd162f32b8995d9b1fefb1b57fac8b1a0e790f897b81cdafe3625d12001"
"0.6.3":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.6.3.tar.gz"
url: "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.6.3.tar.gz"
sha256: "665bf76645ec7b9e6d785a934616f0138862c36cdb58b0d1c9dd18dd4c57395a"
"0.6.2":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.6.2.tar.gz"
url: "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.6.2.tar.gz"
sha256: "02a0540b5b1be0788565f48b065b456d3eab81ae2323a50e75ed36449a0143ed"
"0.6.1":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.6.1.tar.gz"
url: "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.6.1.tar.gz"
sha256: "4bb478eedbe4b2c0093ef7af4f64795304850e03312e658076b25ef8d6019c75"
# 0.6.0 is required by libassert v2
"0.6.0":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.6.0.tar.gz"
url: "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.6.0.tar.gz"
sha256: "7c2996f03d15f61016bc81fe7fa5220b1cc42498333c5c0e699ad2f96b918b96"
"0.5.4":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.5.4.tar.gz"
sha256: "bab0f76330f90c445216ccade1a3ff29c9c4bbd44805be34d52095cd95b02df4"
"0.5.3":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.5.3.tar.gz"
sha256: "fb84b8b021bf8c1265e650b4cc19ae8acc9c07b980eb1e34d9806acf15bb4fdf"
"0.5.2":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.5.2.tar.gz"
sha256: "d148998e175b9c69ffb4383ab321a0d27487392e4eee3f39441d35b6856c8f78"
"0.5.1":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.5.1.tar.gz"
sha256: "27b9f862ec6185f570ee59c07fdd12bebb55a986191518e896621317d2654f26"
"0.5.0":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.5.0.tar.gz"
sha256: "dc034503aed3009618312c42c40e1f80bf14d4148c9bc8b3ea02cf971459120e"
"0.4.1":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.4.1.tar.gz"
sha256: "8b6e2c813cf2db332c1aa0502c38afd01a1e00ece0ecc7fcd82fcae4b34e5161"
"0.4.0":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.4.0.tar.gz"
sha256: "eef368f5bed2d85c976ea90b325e4c9bfc1b9618cbbfa15bf088adc8fa98ff89"
# 0.3.1 is required by libassert v1
"0.3.1":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.3.1.tar.gz"
url: "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.3.1.tar.gz"
sha256: "3c4c5b3406c2b598e5cd2a8cb97f9e8e1f54d6df087a0e62564e6fb68fed852d"
"0.3.0":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.3.0.tar.gz"
sha256: "1650d760ff0c0f9763de7e1e04285033f2b0189df87398ba8bf76e9937d5a4ee"
# 0.2.1 is required by libassert v1
"0.2.1":
url:
- "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.2.1.tar.gz"
url: "https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/v0.2.1.tar.gz"
sha256: "3184f404c61b6b8ba6fe7c64fc40d1c3d6d87df59bcacf1845d846101bc22f9a"
patches:
"0.5.2":
- patch_file: "patches/0.5.2/0001-msvc-bug.patch"
patch_type: "official"
patch_source: "https://github.com/jeremy-rifkin/cpptrace/commit/599d6abd6cc74e80e8429fc309247be5f7edd5d7"
patch_description: "Workaround bug for old msvc"
"0.4.0":
- patch_file: "patches/0.4.0/0001-libdwarf_path.patch"
patch_type: "conan"
patch_source: "https://github.com/jeremy-rifkin/cpptrace/commit/a1624238000c794243e20801dc2b35b2f847d492"
patch_description: "Use new libdwarf header placement"
- patch_file: "patches/0.4.0/0002-zstd.patch"
patch_type: "conan"
patch_source: "https://github.com/jeremy-rifkin/cpptrace/commit/b7d14bc952111df973268c76133bb8ad99afdeb0"
patch_description: "Zstd is handled by libdwarf"
"0.3.0":
- patch_file: "patches/0.3.0/0001-cpptrace_export.patch"
patch_type: "bugfix"
patch_source: "https://github.com/jeremy-rifkin/cpptrace/commit/b3b9d5fda6c7f53b069848e7e79454f3618ca356"
patch_description: "Fix an incorrect CPPTRACE_EXPORT annotation"
"0.2.1":
- patch_file: "patches/0.2.1/0001-to_uintptr.patch"
patch_type: "bugfix"
Expand Down
7 changes: 1 addition & 6 deletions recipes/cpptrace/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from conan import ConanFile
from conan.tools.microsoft import check_min_vs, is_msvc_static_runtime, is_msvc
from conan.tools.files import get, copy, rm, rmdir
from conan.tools.files import get, copy, rmdir
from conan.tools.build import check_min_cppstd
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
from conan.tools.files import apply_conandata_patches, export_conandata_patches
Expand Down Expand Up @@ -95,12 +95,7 @@ def package(self):
if self.settings.os == "Windows" and self.options.shared:
copy(self, "*.dll", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path=False)

rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
rmdir(self, os.path.join(self.package_folder, "share"))
rm(self, "*.la", os.path.join(self.package_folder, "lib"))
rm(self, "*.pdb", os.path.join(self.package_folder, "lib"))
rm(self, "*.pdb", os.path.join(self.package_folder, "bin"))

def package_info(self):
self.cpp_info.libs = ["cpptrace"]
Expand Down
13 changes: 0 additions & 13 deletions recipes/cpptrace/all/patches/0.3.0/0001-cpptrace_export.patch

This file was deleted.

12 changes: 0 additions & 12 deletions recipes/cpptrace/all/patches/0.4.0/0001-libdwarf_path.patch

This file was deleted.

72 changes: 0 additions & 72 deletions recipes/cpptrace/all/patches/0.4.0/0002-zstd.patch

This file was deleted.

36 changes: 0 additions & 36 deletions recipes/cpptrace/all/patches/0.5.2/0001-msvc-bug.patch

This file was deleted.

4 changes: 1 addition & 3 deletions recipes/cpptrace/all/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
cmake_minimum_required(VERSION 3.15)

project(test_package CXX)
project(test_package LANGUAGES CXX)

find_package(cpptrace REQUIRED CONFIG)

add_executable(${PROJECT_NAME} test_package.cpp)

target_link_libraries(${PROJECT_NAME} PRIVATE cpptrace::cpptrace)
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)

Expand Down
1 change: 0 additions & 1 deletion recipes/cpptrace/all/test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from conan.tools.cmake import cmake_layout, CMake
import os

# It will become the standard on Conan 2.x
class TestPackageConan(ConanFile):
settings = "os", "arch", "compiler", "build_type"
generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
Expand Down
4 changes: 2 additions & 2 deletions recipes/cpptrace/all/test_package/test_package.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
int main() {
cpptrace::generate_trace().print();

#ifdef CTRACE
#ifdef CTRACE
ctrace_stacktrace c_trace = ctrace_generate_trace(0, SIZE_MAX);
#endif
#endif

return EXIT_SUCCESS;
}
19 changes: 2 additions & 17 deletions recipes/cpptrace/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
versions:
# Newer versions at the top
"0.7.1":
folder: all
"0.7.0":
folder: all
"0.6.3":
Expand All @@ -10,23 +11,7 @@ versions:
folder: all
"0.6.0":
folder: all
"0.5.4":
folder: all
"0.5.3":
folder: all
"0.5.2":
folder: all
"0.5.1":
folder: all
"0.5.0":
folder: all
"0.4.1":
folder: all
"0.4.0":
folder: all
"0.3.1":
folder: all
"0.3.0":
folder: all
"0.2.1":
folder: all
Loading