Skip to content

Commit

Permalink
(conan-io#24846) [aws refactor] aws-c-cal: Add 0.6.14 and keep 0.5.12
Browse files Browse the repository at this point in the history
* [aws refactor] aws-c-cal: Add 0.6.14 and 0.5.12

* fix

* fix openssl
  • Loading branch information
danimtb authored Aug 7, 2024
1 parent a8e1c51 commit 235e7c4
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 148 deletions.
51 changes: 3 additions & 48 deletions recipes/aws-c-cal/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,56 +1,11 @@
sources:
"0.6.9":
url: "https://github.com/awslabs/aws-c-cal/archive/v0.6.9.tar.gz"
sha256: "46defd807034ca9d873cc1459bc60f0bb4662029f7120db1af464421907fb480"
"0.6.1":
url: "https://github.com/awslabs/aws-c-cal/archive/v0.6.1.tar.gz"
sha256: "52df95150a8548ac35a0e4b6f59fbdebff27e4124c0b7e5eaa969ed3ba62fc82"
"0.5.20":
url: "https://github.com/awslabs/aws-c-cal/archive/v0.5.20.tar.gz"
sha256: "acc352359bd06f8597415c366cf4ec4f00d0b0da92d637039a73323dd55b6cd0"
"0.5.19":
url: "https://github.com/awslabs/aws-c-cal/archive/refs/tags/v0.5.19.tar.gz"
sha256: "23452ab7960c480f1ec0a96ac55bde32d7d27c4a664baeadc248923b19c12086"
"0.5.17":
url: "https://github.com/awslabs/aws-c-cal/archive/v0.5.17.tar.gz"
sha256: "40297da04443d4ee2988d1c5fb0dc4a156d0e4cfaf80e6a1df1867452566d540"
"0.5.13":
url: "https://github.com/awslabs/aws-c-cal/archive/v0.5.13.tar.gz"
sha256: "3aba3954877ea5271ce68361f3bd9c155b422b1149eed403874f6493285ca04d"
"0.6.14":
url: "https://github.com/awslabs/aws-c-cal/archive/v0.6.14.tar.gz"
sha256: "2326304b15bec45b212f6b738020c21afa41f9da295936687e103f9f2efb7b5e"
"0.5.12":
url: "https://github.com/awslabs/aws-c-cal/archive/v0.5.12.tar.gz"
sha256: "350c29a288d5d498bd6574fca659cffc9453bf62691fbde5788399716c2bd132"
patches:
"0.6.9":
- patch_file: "patches/0002-apple-corefoundation-0.6.9.patch"
patch_description: "Link to CoreFoundation on Apple"
patch_type: "backport"
patch_source: "https://github.com/awslabs/aws-c-cal/pull/126"
"0.6.1":
- patch_file: "patches/0002-apple-corefoundation-0.6.1.patch"
patch_description: "Link to CoreFoundation on Apple"
patch_type: "backport"
patch_source: "https://github.com/awslabs/aws-c-cal/pull/126"
"0.5.20":
- patch_file: "patches/0002-apple-corefoundation-0.5.13.patch"
patch_description: "Link to CoreFoundation on Apple"
patch_type: "backport"
patch_source: "https://github.com/awslabs/aws-c-cal/pull/126"
"0.5.19":
- patch_file: "patches/0002-apple-corefoundation-0.5.13.patch"
patch_description: "Link to CoreFoundation on Apple"
patch_type: "backport"
patch_source: "https://github.com/awslabs/aws-c-cal/pull/126"
"0.5.17":
- patch_file: "patches/0002-apple-corefoundation-0.5.13.patch"
patch_description: "Link to CoreFoundation on Apple"
patch_type: "backport"
patch_source: "https://github.com/awslabs/aws-c-cal/pull/126"
"0.5.13":
- patch_file: "patches/0002-apple-corefoundation-0.5.13.patch"
patch_description: "Link to CoreFoundation on Apple"
patch_type: "backport"
patch_source: "https://github.com/awslabs/aws-c-cal/pull/126"
"0.5.12":
- patch_file: "patches/0001-use-openssl-cmake-imported-target.patch"
- patch_file: "patches/0002-apple-corefoundation-0.5.11.patch"
Expand Down
11 changes: 4 additions & 7 deletions recipes/aws-c-cal/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,10 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
if Version(self.version) <= "0.5.20":
self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True)
elif Version(self.version) <= "0.6.1":
self.requires("aws-c-common/0.9.6", transitive_headers=True, transitive_libs=True)
else:
# [>=0.9.7]
self.requires("aws-c-common/0.9.12", transitive_headers=True, transitive_libs=True)
if self.version == "0.6.14":
self.requires("aws-c-common/0.9.15", transitive_headers=True, transitive_libs=True)
if self.version == "0.5.12":
self.requires("aws-c-common/0.6.11", transitive_headers=True, transitive_libs=True)
if self._needs_openssl:
self.requires("openssl/[>=1.1 <4]")

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

12 changes: 1 addition & 11 deletions recipes/aws-c-cal/config.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
versions:
"0.6.9":
folder: all
"0.6.1":
folder: all
"0.5.20":
folder: all
"0.5.19":
folder: all
"0.5.17":
folder: all
"0.5.13":
"0.6.14":
folder: all
"0.5.12":
folder: all

0 comments on commit 235e7c4

Please sign in to comment.