Skip to content

Commit

Permalink
(#24612) watcher: add version 0.11.0, remove older versions
Browse files Browse the repository at this point in the history
  • Loading branch information
toge authored Jul 15, 2024
1 parent 81206e8 commit 1365d7b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 58 deletions.
30 changes: 5 additions & 25 deletions recipes/watcher/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
sources:
"0.11.0":
url: "https://github.com/e-dant/watcher/archive/release/0.11.0.tar.gz"
sha256: "dd92496d77b6bc27e27ed28253faae4d81bc58b19407d154bb49504b2af73664"
"0.10.1":
url: "https://github.com/e-dant/watcher/archive/release/0.10..tar.gz"
sha256: "3c2d3318f64d79437b1305a83382aa26e5054444ac4aed1821937cb97fedc03a"
url: "https://github.com/e-dant/watcher/archive/release/0.10.1.tar.gz"
sha256: "cc14b0adfc23ae90390cf8b4f20291abbc5bf0e358b5d12fa73f7e21d021ccd0"
"0.10.0":
url: "https://github.com/e-dant/watcher/archive/release/0.10.0.tar.gz"
sha256: "c15f088ddc41b58100921ea0b630bcbde83c9960aefecf82221da997f4d4b4ec"
Expand All @@ -17,26 +20,3 @@ sources:
"0.8.7":
url: "https://github.com/e-dant/watcher/archive/release/0.8.7.tar.gz"
sha256: "e83eaf097f8ebe9b87bee2962e6e18f6f2597ae4e76d8d0258adc2c62fa545d2"
"0.8.0":
url: "https://github.com/e-dant/watcher/archive/release/0.8.0.tar.gz"
sha256: "74530f5f6c083ec0348ec41938ae43b02bed1d125125623394f31038fec6f9d1"
"0.6.0":
url: "https://github.com/e-dant/watcher/archive/release/0.6.0.tar.gz"
sha256: "156669c92f9119d658954e124fcd9fc640999fb8a45e2bd915ea8b05e15b925a"
"0.5.5":
url: "https://github.com/e-dant/watcher/archive/release/0.5.5.tar.gz"
sha256: "55da2b7a22cbdba836a405d5cab31a461e84e4e686a117f06399a806d33b2d09"
"0.5.4":
url: "https://github.com/e-dant/watcher/archive/release/0.5.4.tar.gz"
sha256: "0dac1d89886252bb0b999c2dad85aff283022a2b4393922a993459b180b8c663"
"0.5.2":
url: "https://github.com/e-dant/watcher/archive/release/0.5.2.tar.gz"
sha256: "e18e663f9a72a59fca3e7a9e125ca77823b03a3388aa569398965777c5671173"
"0.4.3":
url: "https://github.com/e-dant/watcher/archive/release/0.4.3.tar.gz"
sha256: "8603b45edfa5023752d9e2fdd731efe5a556a542aaf03f6be0e69c68f552b25a"
patches:
"0.5.5":
- patch_file: "patches/0.5.5-fix-limits_max.patch"
patch_description: "fix max macro error in windows"
patch_type: "portability"
10 changes: 2 additions & 8 deletions recipes/watcher/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.files import export_conandata_patches, apply_conandata_patches, get, copy
from conan.tools.files import get, copy
from conan.tools.build import check_min_cppstd
from conan.tools.apple import is_apple_os
from conan.tools.layout import basic_layout
from conan.tools.scm import Version
from conan.tools.microsoft import is_msvc
import os

required_conan_version = ">=1.49.0"
Expand All @@ -19,6 +18,7 @@ class WatcherConan(ConanFile):
topics = ("watch", "filesystem", "event", "header-only")
package_type = "header-library"
settings = "os", "arch", "compiler", "build_type"
no_copy_source = True

@property
def _min_cppstd(self):
Expand All @@ -43,9 +43,6 @@ def _compilers_minimum_version(self):
},
}.get(self._min_cppstd, {})

def export_sources(self):
export_conandata_patches(self)

def layout(self):
basic_layout(self, src_folder="src")

Expand All @@ -71,9 +68,6 @@ def loose_lt_semver(v1, v2):
def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)

def build(self):
apply_conandata_patches(self)

def package(self):
copy(self, pattern="LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
copy(
Expand Down
13 changes: 0 additions & 13 deletions recipes/watcher/all/patches/0.5.5-fix-limits_max.patch

This file was deleted.

14 changes: 2 additions & 12 deletions recipes/watcher/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"0.11.0":
folder: all
"0.10.1":
folder: all
"0.10.0":
Expand All @@ -11,15 +13,3 @@ versions:
folder: all
"0.8.7":
folder: all
"0.8.0":
folder: all
"0.6.0":
folder: all
"0.5.5":
folder: all
"0.5.4":
folder: all
"0.5.2":
folder: all
"0.4.3":
folder: all

0 comments on commit 1365d7b

Please sign in to comment.