Skip to content

Commit dce84d1

Browse files
author
turtlebrowser-bot
committed
schedule : Commit by patricia-gallardo with SHA 932f9c8f0489875b562787f381976ba58ce580ff on refs/heads/master
1 parent 6fd243d commit dce84d1

File tree

11 files changed

+26
-23
lines changed

11 files changed

+26
-23
lines changed

.conan/data/pcre/8.45/_/_/export/conanfile.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
from conans.errors import ConanInvalidConfiguration
33
import os
44

5+
required_conan_version = ">=1.33.0"
6+
57

68
class PCREConan(ConanFile):
79
name = "pcre"
@@ -25,7 +27,7 @@ class PCREConan(ConanFile):
2527
"with_jit": [True, False],
2628
"with_utf": [True, False],
2729
"with_unicode_properties": [True, False],
28-
"with_stack_for_recursion": [True, False]
30+
"with_stack_for_recursion": [True, False],
2931
}
3032
default_options = {
3133
"shared": False,
@@ -40,7 +42,7 @@ class PCREConan(ConanFile):
4042
"with_jit": False,
4143
"with_utf": True,
4244
"with_unicode_properties": True,
43-
"with_stack_for_recursion": True
45+
"with_stack_for_recursion": True,
4446
}
4547

4648
exports_sources = "CMakeLists.txt"
@@ -68,12 +70,6 @@ def configure(self):
6870
if not self.options.build_pcregrep:
6971
del self.options.with_bzip2
7072
del self.options.with_zlib
71-
if not self.options.build_pcre_8 and not self.options.build_pcre_16 and not self.options.build_pcre_32:
72-
raise ConanInvalidConfiguration("At least one of build_pcre_8, build_pcre_16 or build_pcre_32 must be enabled")
73-
if self.options.build_pcrecpp and not self.options.build_pcre_8:
74-
raise ConanInvalidConfiguration("build_pcre_8 must be enabled for the C++ library support")
75-
if self.options.build_pcregrep and not self.options.build_pcre_8:
76-
raise ConanInvalidConfiguration("build_pcre_8 must be enabled for the pcregrep program")
7773
if self.options.with_unicode_properties:
7874
self.options.with_utf = True
7975

@@ -83,10 +79,17 @@ def requirements(self):
8379
if self.options.get_safe("with_zlib"):
8480
self.requires("zlib/1.2.11")
8581

82+
def validate(self):
83+
if not self.options.build_pcre_8 and not self.options.build_pcre_16 and not self.options.build_pcre_32:
84+
raise ConanInvalidConfiguration("At least one of build_pcre_8, build_pcre_16 or build_pcre_32 must be enabled")
85+
if self.options.build_pcrecpp and not self.options.build_pcre_8:
86+
raise ConanInvalidConfiguration("build_pcre_8 must be enabled for the C++ library support")
87+
if self.options.build_pcregrep and not self.options.build_pcre_8:
88+
raise ConanInvalidConfiguration("build_pcre_8 must be enabled for the pcregrep program")
89+
8690
def source(self):
87-
tools.get(**self.conan_data["sources"][self.version])
88-
extracted_dir = self.name + "-" + self.version
89-
os.rename(extracted_dir, self._source_subfolder)
91+
tools.get(**self.conan_data["sources"][self.version],
92+
destination=self._source_subfolder, strip_root=True)
9093

9194
def _patch_sources(self):
9295
cmake_file = os.path.join(self._source_subfolder, "CMakeLists.txt")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1629276813
1+
1631192756
22
conandata.yml: f18b4572b60baa1c1711e3b2b26d3c31
3-
conanfile.py: f76bfbcb704df7981454f5ca0e2a0b53
3+
conanfile.py: cd8403fbd936ddbfb6f7e1a963295b47
44
export_source/CMakeLists.txt: 03e2212714ec93fcb029dfda5a23de17
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"recipe": {"revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "2cdba7f2fe4102944c556aef358a3fa8", "sha1": "c1abe53cdd25fd1acd65eaa92fa1231000e771e9"}, "conanfile.py": {"md5": "f76bfbcb704df7981454f5ca0e2a0b53", "sha1": "38a51601b6af8c1cdc7a70458c688b3302a75728"}, "conan_export.tgz": {"md5": "a6e1298ebccc718ede57863fa93ae09b", "sha1": "f89f516c287a68e63c657d70f0c98433c8e69019"}}}, "packages": {"6b708b31085f36a04cd9dea85c6b67a06a563c31": {"revision": "0", "recipe_revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "ea5f98ebc1c434daae4cc43d0b635576", "sha1": "363bd3056d502f8981418cfbea626c41ac34682d"}, "conaninfo.txt": {"md5": "01d242849dc38a65f92da227c40e2956", "sha1": "0bc2a896415e3c65010cb997aa31fa37e2af6689"}, "conan_package.tgz": {"md5": "2041acce9476611b7fa00c9ef1a68376", "sha1": "a030a04656329256569c49c8752d902be4855560"}}}}}
1+
{"recipe": {"revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "ea6bddd50dee0d191f88411e986bc4a2", "sha1": "6314032115f2aae14284ea83ae7ac62ec2f7775b"}, "conanfile.py": {"md5": "cd8403fbd936ddbfb6f7e1a963295b47", "sha1": "41e70b691c8960e93c85e3f3541d19749203c750"}, "conan_export.tgz": {"md5": "a6e1298ebccc718ede57863fa93ae09b", "sha1": "f89f516c287a68e63c657d70f0c98433c8e69019"}}}, "packages": {"6b708b31085f36a04cd9dea85c6b67a06a563c31": {"revision": "0", "recipe_revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "a61d993c7a1a6afbf4156f34a9069c6b", "sha1": "2fdf6175a754903b8bbf3769717a3c731a2f594f"}, "conaninfo.txt": {"md5": "f4e6f8fa0bb2850fd19ddc8b607ebde0", "sha1": "827baac2640e6ded3158b0ccab81b6142dcce573"}, "conan_package.tgz": {"md5": "735bc08da9afb38790c56b3f8bf49011", "sha1": "92482a2e4f24a8d2bfb8286ca33c2bd2ad1f5864"}}}}}

.conan/data/pcre/8.45/_/_/package/6b708b31085f36a04cd9dea85c6b67a06a563c31/bin/pcre-config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
prefix=/Users/jenkins/w/BuildSingleReference/.conan/data/pcre/8.45/_/_/package/6b708b31085f36a04cd9dea85c6b67a06a563c31
3+
prefix=/Users/jenkins/w/BuildSingleReference@4/.conan/data/pcre/8.45/_/_/package/6b708b31085f36a04cd9dea85c6b67a06a563c31
44
exec_prefix=${prefix}
55
exec_prefix_set=no
66

.conan/data/pcre/8.45/_/_/package/6b708b31085f36a04cd9dea85c6b67a06a563c31/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
zlib:shared=False
5858

5959
[recipe_hash]
60-
22032d8c8dce72cdedfaf03917ee08fa
60+
e37ece0e360a302ad76f65b8619c747f
6161

6262
[env]
6363

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
1629277155
2-
bin/pcre-config: 9e86d6c78dd607c551ca33ad302f906a
1+
1631193587
2+
bin/pcre-config: b9c3375da9910f8af5aea9cbdfeef1d0
33
bin/pcregrep: 3fd42e17c7ab012033f4dfab127d130c
4-
conaninfo.txt: 01d242849dc38a65f92da227c40e2956
4+
conaninfo.txt: f4e6f8fa0bb2850fd19ddc8b607ebde0
55
include/pcre.h: 0837628f873ca907378e474446331ebc
66
include/pcreposix.h: 9c67f0d3ea8d1494e04125afe9c3eb31
7-
lib/libpcre.a: cf668829edb994ac890b864910460fe1
8-
lib/libpcre16.a: d6972f52bd523b8cab0adec46d37c13c
9-
lib/libpcre32.a: 94e4f0d04f5bb4b6baed1cff8a4e2439
10-
lib/libpcreposix.a: ebb770fa3886db0d34f0de8c9605ed48
7+
lib/libpcre.a: 91b33ae0d30c4119a2a763eabb90ed10
8+
lib/libpcre16.a: bfdbcbadd1c01955fc033fc48fb796e2
9+
lib/libpcre32.a: 1d90852df16519833df6332bf43258a5
10+
lib/libpcreposix.a: 0a63814e415e8a96cf07b2096f1bed8b
1111
licenses/LICENCE: b5d5d1a69a24ea2718263f1ff85a1c58

0 commit comments

Comments
 (0)