Skip to content

Commit 12404fb

Browse files
alexv-smirnovalexv-smirnov
authored
Merge pull request #3767 from ydb-platform/mergelibs-240416-0910
Library import 240416-0910
2 parents 49938e7 + f4cb54d commit 12404fb

File tree

827 files changed

+8479
-122874
lines changed

Some content is hidden

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

827 files changed

+8479
-122874
lines changed

‎build/conf/fbs.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ _PY_FBS_DEPS=contrib/python/flatbuffers
2222
### processed when --add-flatbuf-result flag is specified on the command line
2323
### for 'ya make ...' (tar archive is extracted to output directory).
2424
macro FBS_TO_PYSRC(OUT_NAME, IN_FBS_FILES...) {
25-
.CMD=${cwd:ARCADIA_BUILD_ROOT} ${tool:FLATC} --python --python-typing --gen-mutable ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} -o ${BINDIR} ${input:IN_FBS_FILES} && $YMAKE_PYTHON3 ${input:"build/scripts/tar_sources.py"} --exts .py --input $BINDIR --output ${output;noauto;tared:OUT_NAME.py3.fbs.pysrc} ${kv;hide:"p FP"} ${kv;hide:"pc light-green"} ${kv;hide:"tared_kind nodir"} ${hide:FBS_FAKEID}
25+
.CMD=${cwd:ARCADIA_BUILD_ROOT} ${tool:FLATC} --python --no-warnings --python-typing --gen-mutable ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} -o ${BINDIR} ${input:IN_FBS_FILES} && $YMAKE_PYTHON3 ${input:"build/scripts/tar_sources.py"} --exts .py --input $BINDIR --output ${output;noauto;tared:OUT_NAME.py3.fbs.pysrc} ${kv;hide:"p FP"} ${kv;hide:"pc light-green"} ${kv;hide:"tared_kind nodir"} ${hide:FBS_FAKEID}
2626
}
2727

2828
macro FBS_TO_PY2SRC(OUT_NAME, IN_FBS_FILES...) {

‎build/conf/go.conf‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ GOSTD_VERSION=1.22
6363
when ($GOSTD_VERSION == "1.22") {
6464
GOSTD=contrib/go/_std_1.22/src
6565
}
66-
elsewhen ($GOSTD_VERSION == "1.21") {
67-
GOSTD=contrib/go/_std_1.21/src
68-
}
6966
otherwise {
7067
GOSTD=__unsupported_go_std_library_version_[$GOSTD_VERSION]__
7168
}
@@ -121,7 +118,7 @@ GO_YNDEXER_OUTPUT=${output;pre=${MODULE_PREFIX};suf=${MODULE_SUFFIX}${_GO_YNDEXE
121118
GO_PROJECT_PREFIXES=++std-lib-prefix $GO_STD_LIB_PREFIX ++arc-project-prefix $GO_ARCADIA_PROJECT_PREFIX
122119

123120
# tag:go-specific
124-
_GO_FAKEID=${FAKEID}.${BUILD_TYPE}.${GOSTD_VERSION}.${GO_FAKEID}
121+
_GO_FAKEID=${FAKEID}.${GOSTD_VERSION}.${GO_FAKEID}
125122
_CGO_FAKEID=${_GO_FAKEID}.${CPP_FAKEID}
126123

127124
# tag:go-specific

‎build/conf/java.conf‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,9 +1216,6 @@ elsewhen ($JDK_VERSION == "15") {
12161216
elsewhen ($JDK_VERSION == "11") {
12171217
JDK_REAL_VERSION=11
12181218
}
1219-
elsewhen ($JDK_VERSION == "8") {
1220-
JDK_REAL_VERSION=8
1221-
}
12221219
elsewhen ($MAPSMOBI_BUILD_TARGET && $OS_ANDROID) {
12231220
JDK_REAL_VERSION=11
12241221
}
@@ -1254,9 +1251,6 @@ otherwise {
12541251
when ($JDK_REAL_VERSION == "11") {
12551252
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17
12561253
}
1257-
when ($JDK_REAL_VERSION == "8") {
1258-
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk8 build/platform/java/jdk/jdk17
1259-
}
12601254
}
12611255

12621256
# tag:java-specific
@@ -1281,9 +1275,6 @@ when ($JDK_REAL_VERSION == "15") {
12811275
when ($JDK_REAL_VERSION == "11") {
12821276
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11
12831277
}
1284-
when ($JDK_REAL_VERSION == "8") {
1285-
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar8
1286-
}
12871278

12881279
# tag:java-specific
12891280
JAVAC_OPTS=
@@ -1312,20 +1303,12 @@ otherwise {
13121303
when ($JDK_REAL_VERSION == "11") {
13131304
JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL
13141305
}
1315-
when ($JDK_REAL_VERSION == "8") {
1316-
JDK_RESOURCE=$JDK8_RESOURCE_GLOBAL
1317-
}
13181306
}
13191307

13201308
# tag:java-specific
13211309
when (!$USE_SYSTEM_ERROR_PRONE) {
13221310
# Still not done: DTCC-667
1323-
when ($JDK_REAL_VERSION == "8") {
1324-
ERROR_PRONE_VERSION=2.3.1
1325-
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.3.1
1326-
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_3_1_RESOURCE_GLOBAL
1327-
}
1328-
elsewhen ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15") {
1311+
when ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15") {
13291312
ERROR_PRONE_VERSION=2.7.1
13301313
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.7.1
13311314
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_7_1_RESOURCE_GLOBAL
@@ -1393,9 +1376,6 @@ otherwise {
13931376
when ($JDK_REAL_VERSION == "11") {
13941377
UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL
13951378
}
1396-
when ($JDK_REAL_VERSION == "8") {
1397-
UBERJAR_RESOURCE=$UBERJAR8_RESOURCE_GLOBAL
1398-
}
13991379
}
14001380

14011381
# tag:java-specific
@@ -1420,9 +1400,6 @@ when ($JDK_REAL_VERSION == "15") {
14201400
when ($JDK_REAL_VERSION == "11") {
14211401
WITH_JDK_RESOURCE=$WITH_JDK11_RESOURCE_GLOBAL
14221402
}
1423-
when ($JDK_REAL_VERSION == "8") {
1424-
WITH_JDK_RESOURCE=$WITH_JDK8_RESOURCE_GLOBAL
1425-
}
14261403

14271404
# tag:java-specific
14281405
EXTERNAL_JAVA_JDK_RESOURCE=

‎build/conf/proto.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# tag:tool-specific tag:proto
22
PROTOC=${tool:"contrib/tools/protoc"}
3+
when ($PYTHON2 == "yes") {
4+
PROTOC=${tool:"contrib/tools/protoc_old"}
5+
}
36
JAVA_PROTOC=${tool:"contrib/tools/protoc"}
47
NEW_JAVA_PROTOC=yes
58
when ($NEW_JAVA_PROTOC == "yes") {

‎build/conf/python.conf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ macro STYLE_PYTHON(pyproject...) {
246246

247247
# tag:python-specific tag:test
248248
STYLE_RUFF_VALUE=no
249-
RUFF_CONFIG_PATHS_FILE=build/config/tests/ruff/ruff_config_paths.json
249+
RUFF_CONFIG_PATHS_FILE=${ARCADIA_ROOT}/build/config/tests/ruff/ruff_config_paths.json
250250
### @usage: STYLE_RUFF()
251251
###
252252
### Check python3 sources for style issues using ruff.
@@ -938,8 +938,6 @@ macro NO_CYTHON_COVERAGE() {
938938
### Documentation: https://wiki.yandex-team.ru/arcadia/python/pysrcs/#modulipylibrarypy3libraryimakrospysrcs
939939
macro PY_SRCS() {
940940
DEFAULT(MODULE_TAG PY2)
941-
DEFAULT(PYTHON2 yes)
942-
DEFAULT(PYTHON3 no)
943941
}
944942

945943
# tag:python-specific

‎build/conf/ts/ts.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ TS_CONFIG_PATH=tsconfig.json
3333
TS_OUTPUT_FILE=output.tar
3434
TS_OUTPUT_FILE_UUID=output.tar.uuid
3535
TS_EXCLUDE_DIR_GLOB=(.idea|.vscode|node_modules)/**/*
36-
TS_COMMON_OUTDIR_GLOB=(build|dist|bundle|$WEBPACK_OUTPUT_DIR|$TS_NEXT_OUTPUT_DIR|$VITE_OUTPUT_DIR)/**/*
36+
TS_COMMON_OUTDIR_GLOB=(build|dist|bundle|\${join=|:WEBPACK_OUTPUT_DIR}|$TS_NEXT_OUTPUT_DIR|$VITE_OUTPUT_DIR)/**/*
3737
TS_GLOB_EXCLUDE_ADDITIONAL=
3838

3939
module _TS_BASE_UNIT: _BARE_UNIT {

‎build/conf/ts/ts_next.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ TS_NEXT_CMD=$TOUCH_UNIT \
66
&& $ADD_VCS_INFO_FILE_CMD \
77
&& $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-next $NOTS_TOOL_COMMON_BUILDER_ARGS \
88
--bundler-config-path ${input:TS_NEXT_CONFIG_PATH} \
9-
--output-dir ${TS_NEXT_OUTPUT_DIR} \
9+
--output-dirs ${TS_NEXT_OUTPUT_DIR} \
1010
$_NODE_MODULES_INOUTS ${hide:PEERS} \
1111
${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
1212
${output;hide:"package.json"} \

‎build/conf/ts/ts_vite.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ TS_VITE_CMD=$TOUCH_UNIT \
66
&& $ADD_VCS_INFO_FILE_CMD \
77
&& $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-vite $NOTS_TOOL_COMMON_BUILDER_ARGS \
88
--bundler-config-path ${input:VITE_CONFIG_PATH} \
9-
--output-dir ${VITE_OUTPUT_DIR} \
9+
--output-dirs ${VITE_OUTPUT_DIR} \
1010
$_NODE_MODULES_INOUTS ${hide:PEERS} \
1111
${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
1212
${output;hide:"package.json"} \

‎build/conf/ts/ts_webpack.conf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ TS_WEBPACK_CMD=$TOUCH_UNIT \
66
&& $ADD_VCS_INFO_FILE_CMD \
77
&& $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-webpack $NOTS_TOOL_COMMON_BUILDER_ARGS \
88
--bundler-config-path ${input:WEBPACK_CONFIG_PATH} \
9-
--output-dir ${WEBPACK_OUTPUT_DIR} \
9+
--output-dirs ${WEBPACK_OUTPUT_DIR} \
1010
$_NODE_MODULES_INOUTS ${hide:PEERS} \
1111
${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
1212
${output;hide:"package.json"} \
1313
${kv;hide:"pc magenta"} ${kv;hide:"p TS_WPK"}
1414

15-
### @usage: WEBPACK_OUTPUT(DirName)
15+
### @usage: WEBPACK_OUTPUT(FirstDirName DirNames)
1616
###
17-
### Macro sets the output directory name for TS_WEBPACK module.
17+
### Macro sets the output directory names (one at least) for TS_WEBPACK module.
1818
###
19-
### - DirName - output directory name ("bundle" by default).
20-
macro WEBPACK_OUTPUT(DirName) {
21-
SET(WEBPACK_OUTPUT_DIR $DirName)
19+
### - DirNames - output directory names (one at least) ("bundle" by default).
20+
macro WEBPACK_OUTPUT(FirstDirName, DirNames...) {
21+
SET(WEBPACK_OUTPUT_DIR $FirstDirName $DirNames)
2222
}
2323

2424
### @usage: TS_WEBPACK([name])

‎build/config/tests/flake8/ya.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OWNER(
1+
SUBSCRIBER(
22
g:python-committee
33
g:yatest
44
)

0 commit comments

Comments
 (0)