Merge branch 'rightlib' into merge-libs-250302-1120

6 files changed, 14 insertions, 15 deletions

diff --git a/build/conf/docs.conf b/build/conf/docs.conf
index 28d0cf0d7c..c0db3f454e 100644
--- a/build/conf/docs.conf
+++ b/build/conf/docs.conf
@@ -53,7 +53,8 @@ _DOCS_YFM_CMD=$_DOCS_YFM_CMD_IMPL($_DOCS_CONFIG_VALUE EXTRA_INPUTS $_DOCS_EXTRA_
 ### should be defined here.
 module _DOCS_BARE_UNIT: _BARE_UNIT {
     .ALLOWED=DOCS_DIR DOCS_CONFIG DOCS_VARS
-    .CMD=TOUCH_DOCS_MF
+    .CMD=$TOUCH_DOCS_MF
+    .STRUCT_CMD=yes
     .FINAL_TARGET=no
     .NODE_TYPE=Bundle
     .PEERDIR_POLICY=as_include
@@ -82,7 +83,7 @@ _DOCS_LIBRARY_CMD=$_DOCS_LIBRARY_CMD_IMPL(SOURCES $_DOCS_SOURCES_VALUE INCLUDE_S
 
 # tag:docs
 module DOCS_LIBRARY: _DOCS_BARE_UNIT {
-    .CMD=_DOCS_LIBRARY_CMD
+    .CMD=$_DOCS_LIBRARY_CMD
     .ALIASES=SRCS=_DOCS_SRCS DOCS_DIR=_YFM_DOCS_DIR
     .EPILOGUE=_DOCS_LIBRARY_EPILOGUE
     .NODE_TYPE=Library
@@ -150,7 +151,7 @@ macro _DOCS_YFM_USE_PLANTUML() {
 ### @see: [DOCS_DIR()](#macro_DOCS_DIR), [DOCS_CONFIG()](#macro_DOCS_CONFIG), [DOCS_VARS()](#macro_DOCS_VARS).
 multimodule DOCS {
     module DOCSBOOK: _DOCS_BASE_UNIT {
-        .CMD=_DOCS_YFM_CMD
+        .CMD=$_DOCS_YFM_CMD
         .FINAL_TARGET=yes
         .PEERDIR_POLICY=as_build_from
         .IGNORED=DOCS_DIR DOCS_INCLUDE_SOURCES DOCS_COPY_FILES PEERDIR PYTHON RUN_PROGRAM RUN_PYTHON3 RUN_LUA RUN_JAVA_PROGRAM FROM_SANDBOX SRCS COPY COPY_FILE FILES
@@ -167,7 +168,7 @@ multimodule DOCS {
     }
 
     module DOCSLIB: _DOCS_BASE_UNIT {
-        .CMD=_DOCS_YFM_CMD
+        .CMD=$_DOCS_YFM_CMD
         .PEERDIR_POLICY=as_build_from
         .IGNORED=DOCS_DIR DOCS_INCLUDE_SOURCES DOCS_COPY_FILES PEERDIR PYTHON RUN_PROGRAM RUN_PYTHON3 RUN_LUA RUN_JAVA_PROGRAM FROM_SANDBOX SRCS COPY COPY_FILE FILES
         .PEERDIRSELF=DOCSLIB_INTERNAL
diff --git a/build/conf/go.conf b/build/conf/go.conf
index 83b03e753c..9776f39287 100644
--- a/build/conf/go.conf
+++ b/build/conf/go.conf
@@ -1022,5 +1022,5 @@ macro GO_MOCKGEN_MOCKS() {
     PEERDIR(vendor/go.uber.org/mock/gomock)
 
     # Unfortunately ${rootrel;tool:TOOL} doesn't work currently, so we use this ugly workaround $MODDIR/gen/gen$_GO_EXE_SUFFIX
-    RUN_PROGRAM(vendor/go.uber.org/mock/mockgen -package mocks -exec_only $MODDIR/gen/gen$_GO_EXE_SUFFIX ${GO_ARCADIA_PROJECT_PREFIX}${MOCKGEN_FROM} $MOCKGEN_TYPES STDOUT main.go TOOL $MODDIR/gen CWD $ARCADIA_BUILD_ROOT)
+    RUN_PROGRAM(vendor/go.uber.org/mock/mockgen -package mocks -exec_only $MODDIR/gen/gen$_GO_EXE_SUFFIX ${GO_ARCADIA_PROJECT_PREFIX}${MOCKGEN_FROM} $MOCKGEN_TYPES STDOUT main.go TOOL $MODDIR/gen CWD $ARCADIA_BUILD_ROOT ENV PATH=${GO_TOOLS_ROOT}/bin GOROOT=${GO_TOOLS_ROOT} GOCACHE=${BINDIR}/.gocache)
 }
diff --git a/build/conf/java.conf b/build/conf/java.conf
index dbc53bb371..f76b0cfc90 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -451,11 +451,6 @@ macro DEFAULT_JUNIT_JAVA_SRCS_LAYOUT() {
     FULL_JAVA_SRCS(RESOURCES SRCDIR resources **/* SKIP_CHECK_SRCDIR)
 }
 
-macro _HASH_HELPER(Args...) {
-    .CMD=${hash:Args}
-    .SEM=${hash:Args}
-}
-
 macro _GENTAR_HELPER(HASH_SUF="hash_suf", OUT_DIR[]) {
     .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --pack ${OUT_DIR} --outs ${output;tared;suf=$HASH_SUF:OUT_DIR} ${hide;kv:"tared_kind nodir"}
     .SEM=${hide;suf=$HASH_SUF;tared;output:OUT_DIR}
diff --git a/build/conf/opensource.conf b/build/conf/opensource.conf
index ee6dd6cb74..067aacf3cb 100644
--- a/build/conf/opensource.conf
+++ b/build/conf/opensource.conf
@@ -41,6 +41,9 @@ when ($OPENSOURCE == "yes" && $EXPORT_GRADLE == "yes") {
     EXPORT_SEM=yes
     EXPORTED_BUILD_SYSTEM_SOURCE_ROOT=${"$"}{PROJECT_SOURCE_DIR}
     EXPORTED_BUILD_SYSTEM_BUILD_ROOT=${"$"}{PROJECT_BINARY_DIR}
+}
+
+when ($EXPORT_GRADLE == "yes") {
     EXPORT_LANG=JAVA
 }
 
@@ -58,6 +61,9 @@ when ($OPENSOURCE == "yes" && $EXPORT_CMAKE == "yes") {
     EXPORT_SEM=yes
     EXPORTED_BUILD_SYSTEM_SOURCE_ROOT="${PROJECT_SOURCE_DIR}"
     EXPORTED_BUILD_SYSTEM_BUILD_ROOT="${PROJECT_BINARY_DIR}"
+}
+
+when ($EXPORT_CMAKE == "yes") {
     EXPORT_LANG=CPP
 }
 
diff --git a/build/conf/python.conf b/build/conf/python.conf
index 8c0ca876a8..bfa42ee36d 100644
--- a/build/conf/python.conf
+++ b/build/conf/python.conf
@@ -267,6 +267,7 @@ multimodule PY3_PROGRAM {
         # Notify pybuild to skip all python main function definitions
         ENABLE(IGNORE_PY_MAIN)
         NO_CLANG_TIDY()
+        DISABLE(START_TARGET)
     }
 }
 
@@ -435,6 +436,7 @@ multimodule PY3TEST {
         PEERDIR+=library/python/pytest
         _DONT_REQUIRE_LICENSE()
         WITHOUT_VERSION()
+        DISABLE(START_TARGET)
     }
 }
 
diff --git a/build/conf/settings.conf b/build/conf/settings.conf
index 3f0ba1ef70..761d9d83af 100644
--- a/build/conf/settings.conf
+++ b/build/conf/settings.conf
@@ -1,19 +1,14 @@
 JSON_CACHE_IS_ATTACHED=yes
 LANGS_REQUIRE_BUILD_AND_SRC_ROOTS=c asm cython proto flatc swig ydl nlg
-CHECK_GO_INCORRECT_DEPS=yes
 USE_PREBUILT_TOOLS=yes
 RESOLVE_FORCE_LISTDIR=no
-ENABLE_NODE_SELF_UID=yes
 REPORT_CONFIGURE_PROGRESS=yes
-FORCE_RESOLVE_MACRO_INCLS=yes
-ENABLE_RERESOLVE_FOR_GENERATED_FILES=yes
 REPORT_ALL_DUPSRC=yes
 DEPS_CACHE_CONTROL_UIDS_CACHE=yes
 USE_GLOBAL_CMD=yes
 PIC_NO_PIE=no
 FAIL_PY2=no
 MAIN_OUTPUT_AS_EXTRA=yes
-USE_REACHABILITY_TO_REPORT_CONF_ERRORS = yes
 DISABLE_ATD=yes
 
 when ($OS_WINDOWS == "yes") {