Skip to content

Commit

Permalink
Merge pull request #11788 from ydb-platform/mergelibs-241120-1113
Browse files Browse the repository at this point in the history 
Library import 241120-1113
  • Loading branch information
@maximyurchuk
maximyurchuk authored Nov 20, 2024
2 parents 753ecb8 + a7b9a6a commit f76323e
Show file tree
Hide file tree
Showing 8,401 changed files with 5,710 additions and 120,940 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 6 additions & 6 deletions build/conf/go.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,17 +225,17 @@ GO_TOOL=$YMAKE_PYTHON3 ${input:"build/scripts/go_tool.py"} $_PROCESS_WHOLE_ARCHI

# tag:go-specific
macro _GO_LINK_LIB_IMPL(CGO_FILES[], EXTRA_INPUTS[], EXTRA_TEXT_INPUTS[], GO_FILES...) {
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_FBS:PEERS} --ya-end-command-file ${hide;kv:"p GO"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_PROTO_FROM_SCHEMA|local,GO_FBS:PEERS} --ya-end-command-file ${hide;kv:"p GO"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
}

# tag:go-specific
macro _GO_LINK_EXE_IMPL(CGO_FILES[], EXTRA_INPUTS[], EXTRA_TEXT_INPUTS[], GO_FILES...) {
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_FBS|;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${_EXTRA_OBJS} ${rootrel;tags_out=GO|GO_PROTO|GO_FBS|RESOURCE_LIB:PEERS} --ya-end-command-file ${hide;kv:"p LD"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"} && $_GO_LINK_EXE_EXT_CMD
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_PROTO_FROM_SCHEMA|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_PROTO_FROM_SCHEMA|GO_FBS|;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${_EXTRA_OBJS} ${rootrel;tags_out=GO|GO_PROTO|GO_PROTO_FROM_SCHEMA|GO_FBS|RESOURCE_LIB:PEERS} --ya-end-command-file ${hide;kv:"p LD"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"} && $_GO_LINK_EXE_EXT_CMD
}

# tag:go-specific
macro _GO_LINK_TEST_IMPL(CGO_FILES[], EXTRA_INPUTS[], EXTRA_TEXT_INPUTS[], GO_TEST_FILES[], GO_XTEST_FILES[], GO_FILES...) {
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++test-miner $GO_TEST_MINER ++test-import-path $GO_TEST_IMPORT_PATH ++peers ${rootrel;tags_in=local,GO|local,GO_PROGRAM|local,GO_PROTO|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_FBS;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${rootrel;tags_out=GO|GO_PROGRAM|GO_PROTO|GO_FBS|RESOURCE_LIB:PEERS} ++test_srcs ${input:GO_TEST_FILES} ++xtest_srcs ${input:GO_XTEST_FILES} ++cover_info $GO_COVER_INFO_VALUE ++skip-tests $_GO_SKIP_TEST_VALUE --ya-end-command-file ${hide;kv:"p GO"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
.CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++test-miner $GO_TEST_MINER ++test-import-path $GO_TEST_IMPORT_PATH ++peers ${rootrel;tags_in=local,GO|local,GO_PROGRAM|local,GO_PROTO|local,GO_PROTO_FROM_SCHEMA|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_PROTO_FROM_SCHEMA|GO_FBS;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${rootrel;tags_out=GO|GO_PROGRAM|GO_PROTO|GO_PROTO_FROM_SCHEMA|GO_FBS|RESOURCE_LIB:PEERS} ++test_srcs ${input:GO_TEST_FILES} ++xtest_srcs ${input:GO_XTEST_FILES} ++cover_info $GO_COVER_INFO_VALUE ++skip-tests $_GO_SKIP_TEST_VALUE --ya-end-command-file ${hide;kv:"p GO"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
}

# tag:go-specific
Expand Down Expand Up @@ -649,7 +649,7 @@ module _GO_BASE_UNIT: _BASE_UNIT {

ENABLE(_GO_MODULE)
SET(MODULE_TAG GO)
SET(PEERDIR_TAGS GO GO_PROTO GO_FBS __EMPTY__ RESOURCE_LIB)
SET(PEERDIR_TAGS GO GO_PROTO GO_PROTO_FROM_SCHEMA GO_FBS __EMPTY__ RESOURCE_LIB)
DEFAULT(_GO_VET_TOOL)
DEFAULT(_GO_VET_FLAGS)
DEFAULT(_GO_VET_EXTS)
Expand Down Expand Up @@ -815,7 +815,7 @@ module GO_LIBRARY: _GO_BASE_UNIT {
.FINAL_TARGET=no
SET(_GO_TOOL_MODE lib)
SET(MODULE_TYPE LIBRARY)
SET(PEERDIR_TAGS GO GO_PROTO GO_FBS __EMPTY__ RESOURCE_LIB PACKAGE_UNION)
SET(PEERDIR_TAGS GO GO_PROTO GO_PROTO_FROM_SCHEMA GO_FBS __EMPTY__ RESOURCE_LIB PACKAGE_UNION)

MODULE_SUFFIX=.a
}
Expand Down Expand Up @@ -956,7 +956,7 @@ module GO_TEST: GO_PROGRAM {
.ALLOWED=GO_SKIP_TESTS YT_SPEC
.FINAL_TARGET=no
SET(MODULE_TAG GO_TEST)
SET(PEERDIR_TAGS GO GO_PROGRAM GO_PROTO GO_FBS __EMPTY__ RESOURCE_LIB)
SET(PEERDIR_TAGS GO GO_PROGRAM GO_PROTO GO_PROTO_FROM_SCHEMA GO_FBS __EMPTY__ RESOURCE_LIB)
SET(_GO_TOOL_MODE test)
SET(MODULE_TYPE PROGRAM)
ENABLE(GO_TEST_MODULE)
Expand Down
38 changes: 15 additions & 23 deletions build/conf/java.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,17 @@ multimodule JAVA_PROGRAM {
}

_PROCESSOR_CLASSES_VALUE=
_PROCESSOR_CLASSES_SEM=
macro PROCESSOR_CLASSES(Classes...) {
SET_APPEND(_PROCESSOR_CLASSES_VALUE $Classes)
SET_APPEND(_PROCESSOR_CLASSES_SEM && java-apclasses $Classes)
}

_AUTO_SERVICE_SEM=
macro AUTO_SERVICE(Ver) {
USE_ANNOTATION_PROCESSOR(contrib/java/com/google/auto/service/auto-service/${Ver})
# TODO Remove PEERDIR - old AP mechanic
PEERDIR(contrib/java/com/google/auto/service/auto-service-annotations/${Ver})
SET(_AUTO_SERVICE_SEM && java-apautoservice $Ver)
}

_BUILD_JAVA_ANNOTATION_PROCESSOR_SEM=$BUILD_JAR_SEM $_PROCESSOR_CLASSES_SEM $_AUTO_SERVICE_SEM
_BUILD_JAVA_ANNOTATION_PROCESSOR_SEM=$BUILD_JAR_SEM

### @usage: JAVA_ANNOTATION_PROCESSOR()
###
Expand Down Expand Up @@ -296,13 +293,11 @@ multimodule JTEST_FOR {
}
}

# TODO Something for using tool in RUN_JAVA_PROGRAM
_SEM_JAR_RUNNABLE=
multimodule JAVA_CONTRIB_PROGRAM {
module JAR_RUNNABLE: _JAR_RUNNABLE {
.IGNORED=JAVA_SRCS RUN_JAR_PROGRAM RUN_JAVA_PROGRAM JAR_RESOURCE SRC_RESOURCE LOCAL_JAR
.PEERDIRSELF=JAR_COMPILATION
.SEM=_SEM_JAR_RUNNABLE
.SEM=IGNORED

SET(MODULE_TYPE JAVA_PROGRAM)
ENABLE(DISABLE_SCRIPTGEN)
Expand Down Expand Up @@ -375,7 +370,7 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
MAVEN_EXPORT_COORDS_GLOBAL=$MAVEN_EXPORT_GROUP_ID:${MODULE_PREFIX}${REALPRJNAME}:${MAVEN_EXPORT_VERSION}:
}

PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_FBS JAVA_IDL PACKAGE_UNION
PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_PROTO_FROM_SCHEMA JAVA_FBS JAVA_IDL PACKAGE_UNION
HAS_MANAGEABLE_PEERS=yes
DYNAMIC_LINK=yes
_PROTO_CMDLINE=$_JAVA_PROTO_CMDLINE
Expand Down Expand Up @@ -526,23 +521,20 @@ macro _JAR_ANN_PROC_OPTS(Classes...) {
}

# tag:java-specific
_USE_ANNOTATION_PROCESSOR_TOOL=
_USE_ANNOTATION_PROCESSOR_PATH=
_USE_ANNOTATION_PROCESSOR_OPT=
_USE_ANNOTATION_PROCESSOR_SEM=
### @usage: USE_ANNOTATION_PROCESSOR(Path)
###
### Used to specify annotation processor for building JAVA_PROGRAM() and JAVA_LIBRARY().
macro USE_ANNOTATION_PROCESSOR(Path) {
SET(_USE_ANNOTATION_PROCESSOR_TOOL $Path)
SET(_USE_ANNOTATION_PROCESSOR_SEM && use_annotation_processor $Path)
SET(_USE_ANNOTATION_PROCESSOR_PATH $Path)
}

when ($_USE_ANNOTATION_PROCESSOR_TOOL != "") {
_USE_ANNOTATION_PROCESSOR_CMD=${tool:_USE_ANNOTATION_PROCESSOR_TOOL}
_USE_ANNOTATION_PROCESSOR_OPT=${pre=-processorpath "@";suf=.cplst:_USE_ANNOTATION_PROCESSOR_CMD}
}
otherwise {
_USE_ANNOTATION_PROCESSOR_CMD=
_USE_ANNOTATION_PROCESSOR_OPT=
when ($_USE_ANNOTATION_PROCESSOR_PATH != "") {
_USE_ANNOTATION_PROCESSOR_TOOL = ${tool:_USE_ANNOTATION_PROCESSOR_PATH}
_USE_ANNOTATION_PROCESSOR_OPT += ${pre=-processorpath "@";suf=.cplst:_USE_ANNOTATION_PROCESSOR_TOOL}
_USE_ANNOTATION_PROCESSOR_SEM += && use_annotation_processor $_USE_ANNOTATION_PROCESSOR_PATH/${nopath:_USE_ANNOTATION_PROCESSOR_TOOL}
}

# tag:java-specific
Expand All @@ -563,7 +555,7 @@ module _JAR_BASE: _BARE_UNIT {

SET(MODULE_TAG JAVA)

PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__ RESOURCE_LIB
PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_PROTO_FROM_SCHEMA JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__ RESOURCE_LIB

HAS_MANAGEABLE_PEERS=yes
DYNAMIC_LINK=yes
Expand Down Expand Up @@ -1184,7 +1176,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
# tag:java-specific
_SCRIPTGEN_FLAGS=
macro _GEN_JAVA_SCRIPT_IMPL(Out, Template, Props...) {
.CMD=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:Out} --template ${input:Template} ${_SCRIPTGEN_FLAGS} -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${nopath;join;ext=.jar;pre="::":MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${MODDIR} -D JAR_BASENAME=${REALPRJNAME} $Props
.CMD=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:Out} --template ${input:Template} ${_SCRIPTGEN_FLAGS} -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${nopath;join;ext=.jar;pre="::":MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${MODDIR} -D JAR_BASENAME=${REALPRJNAME} -D MAIN_CLASS=${_JAR_MAIN_CLASS} -D ENABLE_PREVIEW_VALUE=${ENABLE_PREVIEW_VALUE} $Props
}

# tag:java-specific
Expand All @@ -1204,7 +1196,7 @@ _GEN_JAVA_RUN_SH_OUTPUT=run.sh
when ($HOST_OS_WINDOWS == "yes") {
_GEN_JAVA_RUN_SH_OUTPUT=run.bat
}
GEN_JAVA_RUN_SH=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:_GEN_JAVA_RUN_SH_OUTPUT} -D GENERATE_DEFAULT_RUNNER=yes -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${nopath;join;pre="::":MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${REALPRJNAME} -D JAR_BASENAME=${REALPRJNAME}
GEN_JAVA_RUN_SH=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:_GEN_JAVA_RUN_SH_OUTPUT} -D GENERATE_DEFAULT_RUNNER=yes -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${nopath;join;pre="::":MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${REALPRJNAME} -D JAR_BASENAME=${REALPRJNAME} -D MAIN_CLASS=${_JAR_MAIN_CLASS} -D ENABLE_PREVIEW=${ENABLE_PREVIEW_VALUE}
GEN_RUN_CP=${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${nopath;qe;pre=$REALPRJNAME/:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET}
COLLECT_JAR_PROGRAM_CP=$FS_TOOLS link_or_copy_to_dir --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} ${ext=.so:MANAGED_PEERS_CLOSURE} ${ext=.dll:MANAGED_PEERS_CLOSURE} ${ext=.dylib:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS} --ya-end-command-file ${BINDIR}/${REALPRJNAME} ${hide;late_out;nopath;ext=.jar;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.so;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dll;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dylib;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE}
MAKE_JAR_PROGRAM_CPLST=${MAKE_JAVA_CLASSPATH_FILE} --from-args ${output;pre=$MODULE_PREFIX;suf=${MODULE_SUFFIX}.cplst:REALPRJNAME} --ya-start-command-file ${nopath;rootrel;ext=.jar;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS_CPLIST} --ya-end-command-file
Expand Down Expand Up @@ -2087,7 +2079,7 @@ module JSRC_LIBRARY: _BARE_UNIT {
.PEERDIR_POLICY=as_include
.FINAL_TARGET=no
.ALIASES=SRCS=FILES
PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_FBS JAVA_IDL
PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_PROTO_FROM_SCHEMA JAVA_FBS JAVA_IDL
MODULE_TYPE=LIBRARY
SET(MODULE_SUFFIX .jsrc)
SET(DONT_RESOLVE_INCLUDES yes)
Expand Down
21 changes: 13 additions & 8 deletions build/conf/project_specific/yql_udf.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ macro UDF_NO_PROBE() {
module YQL_UDF_TEST: PY3TEST_BIN {
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)

PEERDIR($YQL_BASE_TEST_DIR/tests/common/udf_test)
PEERDIR(yql/essentials/tests/common/udf_test)

DEPENDS(yql/essentials/tools/astdiff)
DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
DEPENDS(yql/essentials/tools/udf_resolver)
DATA(arcadia/yql/essentials/mount)
DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test)
DATA(arcadia/yql/essentials/cfg/udf_test)
ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
ENV(YQL_CONFIG_DIR="$YQL_BASE_TEST_DIR/cfg/udf_test")
ENV(YQL_CONFIG_DIR="yql/essentials/cfg/udf_test")
ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun")
ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
Expand All @@ -53,27 +53,32 @@ module YQL_UDF_TEST: PY3TEST_BIN {
module YQL_UDF_YDB_TEST: PY3TEST_BIN {
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)

PEERDIR($YQL_BASE_TEST_DIR/tests/common/udf_test)
PEERDIR(yql/essentials/tests/common/udf_test)

DEPENDS(yql/essentials/tools/astdiff)
DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
DEPENDS(yql/essentials/tools/udf_resolver)
DATA(arcadia/yql/essentials/mount)
DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test)
DATA(arcadia/yql/essentials/cfg/udf_test)
ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
ENV(YQL_CONFIG_DIR="yql/essentials/cfg/udf_test")
ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun")
ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
}

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

PEERDIR($YQL_BASE_TEST_DIR/tests/common/udf_test)
PEERDIR(yql/essentials/tests/common/udf_test)

DEPENDS(yql/essentials/tools/astdiff)
DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
DEPENDS(yql/essentials/tools/udf_resolver)
DATA(arcadia/yql/essentials/mount)
DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test)
DATA(arcadia/yql/essentials/cfg/udf_test)
ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
ENV(YQL_CONFIG_DIR="$YQL_BASE_TEST_DIR/cfg/udf_test")
ENV(YQL_CONFIG_DIR="yql/essentials/cfg/udf_test")
ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun")
ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
Expand Down
Loading

0 comments on commit f76323e

Please sign in to comment.