Skip to content

Commit 519686a

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #11427 from ydb-platform/mergelibs-yql
Mergelibs + YQL moving
2 parents ca52826 + fb050bd commit 519686a

File tree

7,855 files changed

+96031
-99684
lines changed

Some content is hidden

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

7,855 files changed

+96031
-99684
lines changed

‎build/conf/compilers/gnu_compiler.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ _C_CPP_KV_STYLE_P=p CC
216216
_C_CPP_KV_STYLE_PC=pc green
217217

218218
_C_CPP_WRAPPER=$YMAKE_PYTHON3 ${input:"build/scripts/wrapcc.py"} ${input:SRC}
219-
when ($CLANG_TIDY_ARGS || $RETRY_ARGS || $YNDEXER_ARGS || $OPENSOURCE == "yes") {
219+
when ($CLANG_TIDY_ARGS || $RETRY_ARGS || $YNDEXER_ARGS || $OPENSOURCE == "yes" || $RAW_COMPILE_CPP_CMD == "yes" ) {
220220
_C_CPP_WRAPPER=
221221
}
222222

‎build/conf/go.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,6 @@ module GO_LIBRARY: _GO_BASE_UNIT {
817817
SET(MODULE_TYPE LIBRARY)
818818
SET(PEERDIR_TAGS GO GO_PROTO GO_FBS __EMPTY__ RESOURCE_LIB PACKAGE_UNION)
819819

820-
_MAKEFILE_INCLUDE_LIKE_DEPS+=.yo.snapshot.json
821820
MODULE_SUFFIX=.a
822821
}
823822

‎build/conf/java.conf

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,6 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
11741174
}
11751175

11761176
SET(MODULE_TYPE JAVA_LIBRARY)
1177-
ENABLE(YMAKE_JAVA_TEST)
11781177
_ADD_KOTLIN_STYLE_CHECKS($(BUILD_ROOT)/$MODDIR/all-kt-sources.txt REQUIREMENTS cpu:2)
11791178
_ADD_JAVA_STYLE_CHECKS($(BUILD_ROOT)/$MODDIR/lint-java.srclst::$(SOURCE_ROOT))
11801179
_ADD_DETEKT_REPORT_CHECK($(BUILD_ROOT)/$MODDIR/detekt-report.xml)
@@ -1276,15 +1275,13 @@ module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE {
12761275

12771276
# tag:java-specific
12781277
LINK_JAR_TEST=${hide:JAVA_FAKEID} ${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET} ${hide;kv:"p JT"}
1279-
YMAKE_JAVA_TEST=
12801278
module _JAR_TEST: _COMPILABLE_JAR_BASE {
12811279
.FINAL_TARGET=yes
12821280
.CMD=LINK_JAR_TEST
12831281
.DEFAULT_NAME_GENERATOR=FullPath
12841282
CONSUME_NON_MANAGEABLE_PEERS=yes
12851283

12861284
SET(MODULE_SUFFIX .test.cp.jar)
1287-
ENABLE(YMAKE_JAVA_TEST)
12881285
JAVA_TEST()
12891286
CHECK_PROVIDES()
12901287
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
@@ -2137,23 +2134,31 @@ otherwise {
21372134
KOTLIN_JVM_TARGET=$JDK_REAL_VERSION
21382135
}
21392136

2140-
# tag:java-specific
2141-
### @usage: JDK_VERSION(Version)
2137+
# tag:java-specific tag:internal
2138+
### @usage: _JDK_VERSION_INTERNAL(Version) #internal
21422139
###
21432140
### Specify JDK version for module
2144-
macro JDK_VERSION(Arg) {
2141+
macro _JDK_VERSION_INTERNAL(Arg) {
21452142
.SEM=required_jdk $Arg ${hide;output:"JdkVersionFakeProp.java"}
21462143
SET(JDK_REAL_VERSION $Arg)
21472144
_JDK_VERSION_MACRO_CHECK($Arg)
21482145
}
21492146

2147+
# tag:java-specific
2148+
### @usage: JDK_VERSION(Version)
2149+
###
2150+
### Specify JDK version for module
2151+
macro JDK_VERSION(Arg) {
2152+
_JDK_VERSION_INTERNAL($Arg)
2153+
}
2154+
21502155
# tag:java-specific
21512156
### @usage: DEFAULT_JDK_VERSION(Version)
21522157
###
21532158
### Specify JDK version for module, can be overridden by setting the JDK_VERSION variable
21542159
macro DEFAULT_JDK_VERSION(Arg) {
21552160
_SET_FIRST_VALUE(_JDK_VERSION $JDK_VERSION $Arg)
2156-
JDK_VERSION($_JDK_VERSION)
2161+
_JDK_VERSION_INTERNAL($_JDK_VERSION)
21572162
}
21582163

21592164
# tag:java-specific

‎build/conf/licenses.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@
166166
"default": [
167167
"Intel-NDA",
168168
"mimepp",
169-
"OracleOebs"
169+
"OracleOebs",
170+
"Custom-cryptopro-client"
170171
]
171172
},
172173
"REQUIRE_CITATION": {

‎build/conf/project_specific/yql_udf.conf

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ when ($SANITIZER_TYPE || $USE_ARCADIA_PYTHON == "no" || $UDF_NO_PROBE == "yes" |
33
YQL_UDF_LINK_PRG_CMD=$LINK_EXEC_DYN_LIB
44
}
55
otherwise {
6-
YQL_UDF_LINK_CMD=$LINK_DYN_LIB && ${tool:"contrib/ydb/library/yql/tools/udf_probe"} $TARGET ${hide;kv:"p UD"}
7-
YQL_UDF_LINK_PRG_CMD=$LINK_EXEC_DYN_LIB && ${tool:"contrib/ydb/library/yql/tools/udf_probe"} $TARGET ${hide;kv:"p UD"}
6+
YQL_UDF_LINK_CMD=$LINK_DYN_LIB && ${tool:"yql/essentials/tools/udf_probe"} $TARGET ${hide;kv:"p UD"}
7+
YQL_UDF_LINK_PRG_CMD=$LINK_EXEC_DYN_LIB && ${tool:"yql/essentials/tools/udf_probe"} $TARGET ${hide;kv:"p UD"}
88
}
99

1010
### @usage: UDF_BASE(name [EXPORTS symlist_file] [PREFIX prefix]) #internal
@@ -38,45 +38,45 @@ module YQL_UDF_TEST: PY3TEST_BIN {
3838

3939
PEERDIR(contrib/ydb/library/yql/tests/common/udf_test)
4040

41-
DEPENDS(contrib/ydb/library/yql/tools/astdiff)
41+
DEPENDS(yql/essentials/tools/astdiff)
4242
DEPENDS(contrib/ydb/library/yql/tools/yqlrun)
43-
DEPENDS(contrib/ydb/library/yql/tools/udf_resolver)
44-
DATA(arcadia/contrib/ydb/library/yql/mount)
43+
DEPENDS(yql/essentials/tools/udf_resolver)
44+
DATA(arcadia/yql/essentials/mount)
4545
DATA(arcadia/contrib/ydb/library/yql/cfg/udf_test)
46-
ENV(YQL_ASTDIFF_PATH="contrib/ydb/library/yql/tools/astdiff/astdiff")
46+
ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
4747
ENV(YQL_CONFIG_DIR="contrib/ydb/library/yql/cfg/udf_test")
4848
ENV(YQL_YQLRUN_PATH="contrib/ydb/library/yql/tools/yqlrun/yqlrun")
49-
ENV(YQL_SQL2YQL_PATH="contrib/ydb/library/yql/tools/sql2yql/sql2yql")
50-
ENV(YQL_UDFRESOLVER_PATH="contrib/ydb/library/yql/tools/udf_resolver/udf_resolver")
49+
ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
50+
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
5151
}
5252

5353
module YQL_UDF_YDB_TEST: PY3TEST_BIN {
5454
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
5555

5656
PEERDIR(ydb/library/yql/tests/common/udf_test)
5757

58-
DEPENDS(ydb/library/yql/tools/astdiff)
58+
DEPENDS(yql/essentials/tools/astdiff)
5959
DEPENDS(ydb/library/yql/tools/yqlrun)
60-
DEPENDS(ydb/library/yql/tools/udf_resolver)
61-
DATA(arcadia/ydb/library/yql/mount)
60+
DEPENDS(yql/essentials/tools/udf_resolver)
61+
DATA(arcadia/yql/essentials/mount)
6262
DATA(arcadia/ydb/library/yql/cfg/udf_test)
6363
}
6464

6565
module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN {
6666
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
6767

68-
PEERDIR(contrib/ydb/library/yql/tests/common/udf_test)
68+
PEERDIR(ydb/library/yql/tests/common/udf_test)
6969

70-
DEPENDS(contrib/ydb/library/yql/tools/astdiff)
71-
DEPENDS(contrib/ydb/library/yql/tools/yqlrun)
72-
DEPENDS(contrib/ydb/library/yql/tools/udf_resolver)
73-
DATA(arcadia/contrib/ydb/library/yql/mount)
74-
DATA(arcadia/contrib/ydb/library/yql/cfg/udf_test)
75-
ENV(YQL_ASTDIFF_PATH="contrib/ydb/library/yql/tools/astdiff/astdiff")
76-
ENV(YQL_CONFIG_DIR="contrib/ydb/library/yql/cfg/udf_test")
77-
ENV(YQL_YQLRUN_PATH="contrib/ydb/library/yql/tools/yqlrun/yqlrun")
78-
ENV(YQL_SQL2YQL_PATH="contrib/ydb/library/yql/tools/sql2yql/sql2yql")
79-
ENV(YQL_UDFRESOLVER_PATH="contrib/ydb/library/yql/tools/udf_resolver/udf_resolver")
70+
DEPENDS(yql/essentials/tools/astdiff)
71+
DEPENDS(ydb/library/yql/tools/yqlrun)
72+
DEPENDS(yql/essentials/tools/udf_resolver)
73+
DATA(arcadia/yql/essentials/mount)
74+
DATA(arcadia/ydb/library/yql/cfg/udf_test)
75+
ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
76+
ENV(YQL_CONFIG_DIR="ydb/library/yql/cfg/udf_test")
77+
ENV(YQL_YQLRUN_PATH="ydb/library/yql/tools/yqlrun/yqlrun")
78+
ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
79+
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
8080
}
8181

8282
### @usage: _ADD_YQL_UDF_DEPS()
@@ -85,18 +85,18 @@ module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN {
8585
###
8686
### https://yql.yandex-team.ru/docs/yt/udf/cpp/
8787
macro _ADD_YQL_UDF_DEPS() {
88-
PEERDIR(${YQL_BASE_DIR}/public/udf)
89-
PEERDIR(${YQL_BASE_DIR}/public/udf/support)
88+
PEERDIR(yql/essentials/public/udf)
89+
PEERDIR(yql/essentials/public/udf/support)
9090
}
9191

9292
macro _ADD_YQL_UDF_YDB_DEPS() {
93-
PEERDIR(ydb/library/yql/public/udf)
94-
PEERDIR(ydb/library/yql/public/udf/support)
93+
PEERDIR(yql/essentials/public/udf)
94+
PEERDIR(yql/essentials/public/udf/support)
9595
}
9696

9797
macro _ADD_YQL_UDF_DEPS_CONTRIB() {
98-
PEERDIR(contrib/ydb/library/yql/public/udf)
99-
PEERDIR(contrib/ydb/library/yql/public/udf/support)
98+
PEERDIR(yql/essentials/public/udf)
99+
PEERDIR(yql/essentials/public/udf/support)
100100
}
101101

102102
### @usage: _MAKE_YQL_UDF()
@@ -108,7 +108,7 @@ macro _MAKE_YQL_UDF() {
108108
_ADD_YQL_UDF_DEPS()
109109
SET_APPEND(USER_CXXFLAGS -DBUILD_UDF)
110110
# For Windows using declspecs
111-
DEFAULT(YQL_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_BASE_DIR}/public/udf/udfs_exports.exports)
111+
DEFAULT(YQL_UDF_EXPORT ${ARCADIA_ROOT}/yql/essentials/public/udf/udfs_exports.exports)
112112

113113
when ($WINDOWS == "yes") {
114114
YQL_UDF_EXPORT=
@@ -121,7 +121,7 @@ macro _MAKE_YQL_UDF_YDB() {
121121
_ADD_YQL_UDF_YDB_DEPS()
122122
SET_APPEND(USER_CXXFLAGS -DBUILD_UDF)
123123
# For Windows using declspecs
124-
DEFAULT(YQL_UDF_EXPORT ${ARCADIA_ROOT}/ydb/library/yql/public/udf/udfs_exports.exports)
124+
DEFAULT(YQL_UDF_EXPORT ${ARCADIA_ROOT}/yql/essentials/public/udf/udfs_exports.exports)
125125

126126
when ($WINDOWS == "yes") {
127127
YQL_UDF_EXPORT=
@@ -134,7 +134,7 @@ macro _MAKE_YQL_UDF_CONTRIB() {
134134
_ADD_YQL_UDF_DEPS_CONTRIB()
135135
SET_APPEND(USER_CXXFLAGS -DBUILD_UDF)
136136
# For Windows using declspecs
137-
DEFAULT(YQL_UDF_EXPORT ${ARCADIA_ROOT}/contrib/ydb/library/yql/public/udf/udfs_exports.exports)
137+
DEFAULT(YQL_UDF_EXPORT ${ARCADIA_ROOT}/yql/essentials/public/udf/udfs_exports.exports)
138138

139139
when ($WINDOWS == "yes") {
140140
YQL_UDF_EXPORT=

‎build/conf/proto.conf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,11 +796,15 @@ multimodule PROTO_LIBRARY {
796796
.EPILOGUE=_TS_CONFIG_EPILOGUE
797797
.PEERDIRSELF=TS_PREPARE_DEPS
798798
DISABLE(_NEED_SBOM_INFO)
799+
800+
when ($_COMMON_GOOGLE_APIS != "None") {
801+
PEERDIR += contrib/libs/googleapis-common-protos
802+
}
799803
}
800804

801805
module TS_PREPARE_DEPS: _PREPARE_DEPS_BASE {
802806
.INCLUDE_TAG=no
803-
.IGNORED=PEERDIR
807+
.IGNORED=PEERDIR SRCS GENERATE_ENUM_SERIALIZATION
804808
DISABLE(_NEED_SBOM_INFO)
805809
}
806810

‎build/conf/python.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ module _BASE_PY_PROGRAM: _BASE_PROGRAM {
732732

733733
# tag:python-specific tag:codenav
734734
when ($CODENAVIGATION && $NOCODENAVIGATION != "yes") {
735-
PY3_PROGRAM_LINK_EXE=$LINK_EXE ${hide;kv:"py3yndex $TARGET"}
735+
PY3_PROGRAM_LINK_EXE=$LINK_EXE && ${hide;kv:"py3yndex $TARGET"}
736736
}
737737
otherwise {
738738
PY3_PROGRAM_LINK_EXE=$LINK_EXE

‎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:7376206195"
4+
"uri": "sbr:7386587280"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7376203383"
7+
"uri": "sbr:7386586845"
88
},
99
"linux": {
10-
"uri": "sbr:7376210406"
10+
"uri": "sbr:7386588080"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:7376200682"
13+
"uri": "sbr:7386586293"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:7376207833"
16+
"uri": "sbr:7386587719"
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:7376206584"
4+
"uri": "sbr:7386590256"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7376203985"
7+
"uri": "sbr:7386589520"
88
},
99
"linux": {
10-
"uri": "sbr:7376211220"
10+
"uri": "sbr:7386591470"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:7376200902"
13+
"uri": "sbr:7386588954"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:7376208912"
16+
"uri": "sbr:7386590846"
1717
}
1818
}
1919
}

0 commit comments

Comments
 (0)