Merge branch 'rightlib' into merge-libs-250314-0050

4 files changed, 30 insertions, 17 deletions

diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index 1c0b9df04d..045374757f 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -201,7 +201,6 @@ OBJECT_SUF=$OBJ_SUF$_CROSS_SUFFIX.o
 GCC_COMPILE_FLAGS=$EXTRA_C_FLAGS -c -o $_COMPILE_OUTPUTS ${pre=-I:_C__INCLUDE}
 EXTRA_COVERAGE_OUTPUT=${hide;noauto;output;suf=${OBJECT_SUF}.gcno:SRC}
 CLANG_TIDY_OUTPUT_FILE=${noauto;output;suf=${OBJECT_SUF}.tidyjson:SRC}
-YNDEXER_OUTPUT_FILE=${noauto;output;suf=${OBJECT_SUF}${COMPILE_OUT_SUFFIX}.ydx.pb2:SRC}
 
 when ($DUMP_COMPILER_DEPS == "yes") {
     DUMP_DEPS=-MD ${hide;noauto;output;suf=${OBJ_SUF}.o.d:SRC}
@@ -242,7 +241,7 @@ _CPP_ARGS_NEW=\
     $CLANG_STATIC_ANALYZER_OPTIONS_NEW && \
     $CLANG_TIDY_ARGS \
     $_C_CPP_WRAPPER \
-    $YNDEXER_ARGS \
+    $CPPYNDEXER_ARGS \
     $RETRY_ARGS \
     $CXX_COMPILER \
     $C_FLAGS_PLATFORM \
@@ -256,14 +255,14 @@ _CPP_ARGS_NEW=\
     $_LANG_CFLAGS_VALUE_NEW \
     ${input:SRC} \
     $TOOLCHAIN_ENV \
-    $YNDEXER_OUTPUT \
+    $CPPYNDEXER_OUTPUT \
     && $_COMPILER_TIME_TRACE_POSTPROCESS \
     $_C_CPP_KV_STYLE_NEW
 
 _C_ARGS_NEW=\
     $CLANG_TIDY_ARGS \
     $_C_CPP_WRAPPER \
-    $YNDEXER_ARGS \
+    $CPPYNDEXER_ARGS \
     $RETRY_ARGS \
     $C_COMPILER \
     $C_FLAGS_PLATFORM \
@@ -277,7 +276,7 @@ _C_ARGS_NEW=\
     $SRCFLAGS \
     ${input:SRC} \
     $TOOLCHAIN_ENV \
-    $YNDEXER_OUTPUT \
+    $CPPYNDEXER_OUTPUT \
     $_C_CPP_KV_STYLE_NEW \
     $SCU_NAME_KV_NEW
 
@@ -289,8 +288,8 @@ _C_ARGS_NEW=\
 ### $EXTRA_OUTPUT
 ### $EXTRA_COVERAGE_OUTPUT
 ### $SRCFLAGS
-### $YNDEXER_ARGS
-### $YNDEXER_OUTPUT
+### $CPPYNDEXER_ARGS
+### $CPPYNDEXER_OUTPUT
 ###
 ### $GCC_COMPILE_FLAGS is substituted for $EXTRA_C_FLAGS -c -o ${OUTFILE} ${SRC} ${pre=-I:INC}
 _SRC_C_NODEPS_CMD=\
diff --git a/build/conf/go.conf b/build/conf/go.conf
index 9776f39287..2618387419 100644
--- a/build/conf/go.conf
+++ b/build/conf/go.conf
@@ -202,7 +202,7 @@ _GO_TOOL_COMMON_FLAGS=\
 
 # tag:go-specific
 macro _GO_GEN_COVER_GO(GO_FILE, GO_COVER_OUTPUT, VAR_ID) {
-    .CMD=${hide:_GO_FAKEID} $GO_TOOLS_ROOT/pkg/tool/$_GO_TC_PATH/cover -mode set -var $VAR_ID -o ${output;noext;suf=.cover.go:GO_COVER_OUTPUT} ${input:GO_FILE}
+    .CMD=${hide:_GO_FAKEID} ${cwd;rootdir;input:GO_FILE} $GO_TOOLS_ROOT/pkg/tool/$_GO_TC_PATH/cover -mode set -var $VAR_ID -o ${output;noext;suf=.cover.go:GO_COVER_OUTPUT} ${rootrel;input:GO_FILE}
 }
 
 # tag:go-specific
diff --git a/build/conf/licenses.json b/build/conf/licenses.json
index 3a315c284d..8f525169f1 100644
--- a/build/conf/licenses.json
+++ b/build/conf/licenses.json
@@ -362,7 +362,9 @@
     "REQUIRE_MODIFICATIONS_DISCLOSURE": {
         "default": [
             "CDDL-1.0",
-            "CDDL-1.1"
+            "CDDL-1.1",
+            "EPL-1.0",
+            "EPL-2.0"
         ]
     },
     "SERVICE": {
@@ -414,14 +416,6 @@
         "LGPL-3.0-or-later": {
             "static": [ "REQUIRE_DERIVATIVE_DISCLOSURE" ],
             "dynamic": [ "REQUIRE_CITATION" ]
-        },
-        "EPL-1.0": {
-            "static": [ "REQUIRE_DERIVATIVE_DISCLOSURE" ],
-            "dynamic": [ "REQUIRE_MODIFICATIONS_DISCLOSURE" ]
-        },
-        "EPL-2.0": {
-            "static": [ "REQUIRE_DERIVATIVE_DISCLOSURE" ],
-            "dynamic": [ "REQUIRE_MODIFICATIONS_DISCLOSURE" ]
         }
     }
 }
diff --git a/build/conf/yndexing/cpp_instrumentation.conf b/build/conf/yndexing/cpp_instrumentation.conf
new file mode 100644
index 0000000000..c15c226479
--- /dev/null
+++ b/build/conf/yndexing/cpp_instrumentation.conf
@@ -0,0 +1,20 @@
+TOOL_CPPYNDEXER=
+
+CPPYNDEXER_ARGS=
+CPPYNDEXER_OUTPUT=
+
+macro POPULATE_CPP_YNDEXING() {
+    when ($CODENAVIGATION && $NOCODENAVIGATION != "yes" && $CPP_YNDEXING && $CPP_YNDEXING != "no") {
+        CPPYNDEXER_BIN=${CPPYNDEXER_RESOURCE_GLOBAL}/yndexer
+        when ($TOOL_CPPYNDEXER != "") {
+          CPPYNDEXER_BIN=$TOOL_CPPYNDEXER
+        }
+
+        CPPYNDEXER_ARGS=$YMAKE_PYTHON ${input:"build/scripts/yndexer.py"} $CPPYNDEXER_BIN 1500 $(SOURCE_ROOT) $ARCADIA_BUILD_ROOT ${input:SRC}
+        CPPYNDEXER_OUTPUT=${noauto;output;suf=${OBJ_CROSS_SUF}${COMPILE_OUT_SUFFIX}.ydx.pb2:SRC}
+    }
+    otherwise {
+        CPPYNDEXER_ARGS=
+        CPPYNDEXER_OUTPUT=
+    }
+}