Skip to content

Commit 6b4f46a

Browse files
alexv-smirnovalexv-smirnov
authored
Import libs 3 (#679)
1 parent a8b737f commit 6b4f46a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+420
-478
lines changed

‎build/conf/java.conf

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,24 @@ multimodule JAVA_PROGRAM {
7474
}
7575
}
7676

77+
### Usage JUNIT_TESTS_JAR(path/to/some/peer realname.jar)
78+
###
79+
### Specifies jar to search test suites and test cases. By default tests are
80+
### searched in the jar compild by JTEST or JUNIT5 module sources. This macro
81+
### allows to specify diferent jar to search tests.
82+
###
83+
### Only one jar file is used to search tests. If this macro invoked multiple
84+
### times (which is not reccomended practice) only the last invocation will
85+
### have effect.
86+
###
87+
### If this macro is used no test from the module build by current ya.make
88+
### will be searched and executed.
89+
macro JUNIT_TESTS_JAR(Dir, Jar) {
90+
SET(UNITTEST_DIR $Dir)
91+
PEERDIR($Dir)
92+
SET(UNITTEST_MOD $Dir/$Jar)
93+
}
94+
7795
BUILD_JUNIT5_JAR_SEM=$BUILD_JAR_SEM && junit5_test
7896

7997
multimodule JUNIT5 {
@@ -102,6 +120,7 @@ multimodule JUNIT5 {
102120
.FINAL_TARGET=no
103121
.DEFAULT_NAME_GENERATOR=FullPath
104122
.SEM=BUILD_JUNIT5_JAR_SEM
123+
.IGNORED=JUNIT_TESTS_JAR
105124

106125
PEERDIR+=devtools/junit5-runner
107126
PEERDIR+=build/platform/java/jacoco-agent
@@ -157,6 +176,7 @@ multimodule JTEST {
157176
.FINAL_TARGET=no
158177
.DEFAULT_NAME_GENERATOR=FullPath
159178
.SEM=BUILD_JUNIT4_JAR_SEM
179+
.IGNORED=JUNIT_TESTS_JAR
160180

161181
SET(MODULE_TYPE JTEST)
162182
DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8)
@@ -197,6 +217,7 @@ multimodule JTEST_FOR {
197217
# |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path)
198218
.IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION PROVIDES FEATURE_VERSION
199219
.ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE
220+
.RESTRICTED=JUNIT_TESTS_JAR
200221
.PEERDIRSELF=JAR_COMPILATION
201222
.SEM=PROGRAM_AND_TESTS_CP_COLLECTING_NODES_SEM
202223

@@ -210,6 +231,7 @@ multimodule JTEST_FOR {
210231
.FINAL_TARGET=no
211232
.DEFAULT_NAME_GENERATOR=FullPath
212233
.SEM=BUILD_JUNIT4_JAR_SEM
234+
.RESTRICTED=JUNIT_TESTS_JAR
213235

214236
SET(MODULE_TYPE JTEST_FOR)
215237
DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8)

‎build/external_resources/ymake/public.resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:5550834592"
4+
"uri": "sbr:5569062376"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:5550838146"
7+
"uri": "sbr:5569072879"
88
},
99
"linux": {
10-
"uri": "sbr:5550826871"
10+
"uri": "sbr:5569070627"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:5550843115"
13+
"uri": "sbr:5569095361"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:5550838970"
16+
"uri": "sbr:5569066861"
1717
}
1818
}
1919
}

‎build/external_resources/ymake/resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:5550837873"
4+
"uri": "sbr:5569055879"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:5550841763"
7+
"uri": "sbr:5569046692"
88
},
99
"linux": {
10-
"uri": "sbr:5550823946"
10+
"uri": "sbr:5569080477"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:5550840880"
13+
"uri": "sbr:5569058127"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:5550839664"
16+
"uri": "sbr:5569069854"
1717
}
1818
}
1919
}

‎build/mapping.conf.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
"5523579199": "https://devtools-registry.s3.yandex.net/5523579199",
8787
"5530948376": "https://devtools-registry.s3.yandex.net/5530948376",
8888
"5545691160": "https://devtools-registry.s3.yandex.net/5545691160",
89+
"5559524010": "https://devtools-registry.s3.yandex.net/5559524010",
8990
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
9091
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
9192
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -95,6 +96,7 @@
9596
"5530946535": "https://devtools-registry.s3.yandex.net/5530946535",
9697
"5545693767": "https://devtools-registry.s3.yandex.net/5545693767",
9798
"5545709989": "https://devtools-registry.s3.yandex.net/5545709989",
99+
"5559537477": "https://devtools-registry.s3.yandex.net/5559537477",
98100
"5559549864": "https://devtools-registry.s3.yandex.net/5559549864",
99101
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
100102
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
@@ -125,18 +127,23 @@
125127
"5476908047": "https://devtools-registry.s3.yandex.net/5476908047",
126128
"5509380757": "https://devtools-registry.s3.yandex.net/5509380757",
127129
"5550834592": "https://devtools-registry.s3.yandex.net/5550834592",
130+
"5569062376": "https://devtools-registry.s3.yandex.net/5569062376",
128131
"5476891477": "https://devtools-registry.s3.yandex.net/5476891477",
129132
"5509369518": "https://devtools-registry.s3.yandex.net/5509369518",
130133
"5550838146": "https://devtools-registry.s3.yandex.net/5550838146",
134+
"5569072879": "https://devtools-registry.s3.yandex.net/5569072879",
131135
"5476896849": "https://devtools-registry.s3.yandex.net/5476896849",
132136
"5509364024": "https://devtools-registry.s3.yandex.net/5509364024",
133137
"5550826871": "https://devtools-registry.s3.yandex.net/5550826871",
138+
"5569070627": "https://devtools-registry.s3.yandex.net/5569070627",
134139
"5476895322": "https://devtools-registry.s3.yandex.net/5476895322",
135140
"5509360013": "https://devtools-registry.s3.yandex.net/5509360013",
136141
"5550843115": "https://devtools-registry.s3.yandex.net/5550843115",
142+
"5569095361": "https://devtools-registry.s3.yandex.net/5569095361",
137143
"5476896707": "https://devtools-registry.s3.yandex.net/5476896707",
138144
"5509388614": "https://devtools-registry.s3.yandex.net/5509388614",
139145
"5550838970": "https://devtools-registry.s3.yandex.net/5550838970",
146+
"5569066861": "https://devtools-registry.s3.yandex.net/5569066861",
140147
"2980468199": "https://devtools-registry.s3.yandex.net/2980468199",
141148
"5562224408": "https://devtools-registry.s3.yandex.net/5562224408"
142149
},
@@ -226,6 +233,7 @@
226233
"5523579199": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
227234
"5530948376": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
228235
"5545691160": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
236+
"5559524010": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
229237
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
230238
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
231239
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -235,6 +243,7 @@
235243
"5530946535": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
236244
"5545693767": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
237245
"5545709989": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
246+
"5559537477": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
238247
"5559549864": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
239248
"4307890075": "flake8_linter for linux",
240249
"5517245192": "flake8_linter for linux",
@@ -265,21 +274,26 @@
265274
"5476908047": "ymake for darwin",
266275
"5509380757": "ymake for darwin",
267276
"5550834592": "ymake for darwin",
277+
"5569062376": "ymake for darwin",
268278
"5476891477": "ymake for darwin-arm64",
269279
"5509369518": "ymake for darwin-arm64",
270280
"5550838146": "ymake for darwin-arm64",
281+
"5569072879": "ymake for darwin-arm64",
271282
"5476896849": "ymake for linux",
272283
"5509364024": "ymake for linux",
273284
"5550826871": "ymake for linux",
285+
"5569070627": "ymake for linux",
274286
"5476895322": "ymake for linux-aarch64",
275287
"5509360013": "ymake for linux-aarch64",
276288
"5550843115": "ymake for linux-aarch64",
289+
"5569095361": "ymake for linux-aarch64",
277290
"5476896707": "ymake.exe for win32-clang-cl",
278291
"5509388614": "ymake.exe for win32-clang-cl",
279292
"5550838970": "ymake.exe for win32-clang-cl",
293+
"5569066861": "ymake.exe for win32-clang-cl",
280294
"2980468199": "ytexec for linux",
281295
"5562224408": "ytexec for linux"
282296
},
283297
"resources_info": {},
284298
"tasks": {}
285-
}
299+
}

‎build/platform/test_tool/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ IF (TEST_TOOL3_HOST_LOCAL)
1111
MESSAGE(WARNING Host test tool3 $TEST_TOOL3_HOST_LOCAL will be used)
1212
ENDIF()
1313

14-
IF (OPENSOURCE)
14+
IF (OPENSOURCE AND USE_OPENSOURCE_TEST_TOOL)
1515
INCLUDE(host_os.ya.make.inc)
1616
ELSE()
1717
INCLUDE(host.ya.make.inc)

‎build/sysincl/darwin.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
- CoreTelephony/CTTelephonyNetworkInfo.h
204204
- CoreText/CoreText.h
205205
- CoreVideo/CoreVideo.h
206+
- DeviceCheck/DCAppAttestService.h
206207
- Foundation/Foundation.h
207208
- Foundation/NSException.h
208209
- Foundation/NSString.h

‎build/ymake.core.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ FORCE_COVERAGE_ENABLED=
3939
FORCE_COVERAGE_DISABLED=
4040
OBJADDE_LIB=
4141
OBJADDE_LIB_GLOBAL=
42+
TRUE=yes
43+
FALSE=no
4244

4345
MODULE_PREFIX=
4446
MODULE_SUFFIX=

‎contrib/libs/poco/Foundation/include/Poco/UTF32Encoding.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,15 @@ class Foundation_API UTF32Encoding: public TextEncoding
6868
int convert(int ch, unsigned char* bytes, int length) const;
6969
int queryConvert(const unsigned char* bytes, int length) const;
7070
int sequenceLength(const unsigned char* bytes, int length) const;
71+
72+
protected:
73+
static int safeToInt(Poco::UInt32 value)
74+
{
75+
if (value <= 0x10FFFF)
76+
return static_cast<int>(value);
77+
else
78+
return -1;
79+
}
7180

7281
private:
7382
bool _flipBytes;

‎contrib/libs/poco/Foundation/src/UTF32Encoding.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ const char* UTF32Encoding::_names[] =
3030

3131
const TextEncoding::CharacterMap UTF32Encoding::_charMap =
3232
{
33-
/* 00 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
34-
/* 10 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
35-
/* 20 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
36-
/* 30 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
37-
/* 40 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
38-
/* 50 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
39-
/* 60 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
40-
/* 70 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
41-
/* 80 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
42-
/* 90 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
43-
/* a0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
44-
/* b0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
45-
/* c0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
46-
/* d0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
47-
/* e0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
48-
/* f0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
33+
/* 00 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
34+
/* 10 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
35+
/* 20 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
36+
/* 30 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
37+
/* 40 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
38+
/* 50 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
39+
/* 60 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
40+
/* 70 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
41+
/* 80 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
42+
/* 90 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
43+
/* a0 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
44+
/* b0 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
45+
/* c0 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
46+
/* d0 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
47+
/* e0 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
48+
/* f0 */ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
4949
};
5050

5151

@@ -118,7 +118,7 @@ const TextEncoding::CharacterMap& UTF32Encoding::characterMap() const
118118
int UTF32Encoding::convert(const unsigned char* bytes) const
119119
{
120120
UInt32 uc;
121-
unsigned char* p = (unsigned char*) &uc;
121+
unsigned char* p = reinterpret_cast<unsigned char*>(&uc);
122122
*p++ = *bytes++;
123123
*p++ = *bytes++;
124124
*p++ = *bytes++;
@@ -129,7 +129,7 @@ int UTF32Encoding::convert(const unsigned char* bytes) const
129129
ByteOrder::flipBytes(uc);
130130
}
131131

132-
return uc;
132+
return safeToInt(uc);
133133
}
134134

135135

@@ -138,7 +138,7 @@ int UTF32Encoding::convert(int ch, unsigned char* bytes, int length) const
138138
if (bytes && length >= 4)
139139
{
140140
UInt32 ch1 = _flipBytes ? ByteOrder::flipBytes((UInt32) ch) : (UInt32) ch;
141-
unsigned char* p = (unsigned char*) &ch1;
141+
unsigned char* p = reinterpret_cast<unsigned char*>(&ch1);
142142
*bytes++ = *p++;
143143
*bytes++ = *p++;
144144
*bytes++ = *p++;
@@ -155,14 +155,14 @@ int UTF32Encoding::queryConvert(const unsigned char* bytes, int length) const
155155
if (length >= 4)
156156
{
157157
UInt32 uc;
158-
unsigned char* p = (unsigned char*) &uc;
158+
unsigned char* p = reinterpret_cast<unsigned char*>(&uc);
159159
*p++ = *bytes++;
160160
*p++ = *bytes++;
161161
*p++ = *bytes++;
162162
*p++ = *bytes++;
163163
if (_flipBytes)
164164
ByteOrder::flipBytes(uc);
165-
return uc;
165+
ret = safeToInt(uc);
166166
}
167167

168168
return ret;

‎contrib/python/importlib-metadata/py3/.dist-info/METADATA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: importlib-metadata
3-
Version: 6.9.0
3+
Version: 7.0.0
44
Summary: Read metadata from Python packages
55
Home-page: https://github.com/python/importlib_metadata
66
Author: Jason R. Coombs

‎contrib/python/importlib-metadata/py3/importlib_metadata/__init__.py

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import abc
44
import csv
55
import sys
6+
import json
67
import email
8+
import types
79
import inspect
810
import pathlib
911
import operator
@@ -20,7 +22,6 @@
2022
NullFinder,
2123
StrPath,
2224
install,
23-
pypy_partial,
2425
)
2526
from ._functools import method_cache, pass_none
2627
from ._itertools import always_iterable, unique_everseen
@@ -131,34 +132,7 @@ def valid(line: str):
131132
return line and not line.startswith('#')
132133

133134

134-
class DeprecatedTuple:
135-
"""
136-
Provide subscript item access for backward compatibility.
137-
138-
>>> recwarn = getfixture('recwarn')
139-
>>> ep = EntryPoint(name='name', value='value', group='group')
140-
>>> ep[:]
141-
('name', 'value', 'group')
142-
>>> ep[0]
143-
'name'
144-
>>> len(recwarn)
145-
1
146-
"""
147-
148-
# Do not remove prior to 2023-05-01 or Python 3.13
149-
_warn = functools.partial(
150-
warnings.warn,
151-
"EntryPoint tuple interface is deprecated. Access members by name.",
152-
DeprecationWarning,
153-
stacklevel=pypy_partial(2),
154-
)
155-
156-
def __getitem__(self, item):
157-
self._warn()
158-
return self._key()[item]
159-
160-
161-
class EntryPoint(DeprecatedTuple):
135+
class EntryPoint:
162136
"""An entry point as defined by Python packaging conventions.
163137
164138
See `the packaging docs on entry points
@@ -630,6 +604,16 @@ def url_req_space(req):
630604
space = url_req_space(section.value)
631605
yield section.value + space + quoted_marker(section.name)
632606

607+
@property
608+
def origin(self):
609+
return self._load_json('direct_url.json')
610+
611+
def _load_json(self, filename):
612+
return pass_none(json.loads)(
613+
self.read_text(filename),
614+
object_hook=lambda data: types.SimpleNamespace(**data),
615+
)
616+
633617

634618
class DistributionFinder(MetaPathFinder):
635619
"""

0 commit comments

Comments
 (0)