Some renaming and simple improves in semantics

Some renaming and simple improves in semantics
commit_hash:4a022b36c543d49ad8955de5f8dd07ab6084049f

6 files changed, 27 insertions, 22 deletions

diff --git a/build/conf/java.conf b/build/conf/java.conf
index 16f034305c..74d5a9d52d 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -999,7 +999,7 @@ _BUILD_JAR_SEM= \
     $_ENABLE_PREVIEW_SEM \
     $_JAR_SOURCE_SET_SEM
 
-BUILD_PROTO_JAR_SEM= \
+_BUILD_PROTO_JAR_SEM= \
     ${hide:target} ${hide:AUTO_INPUT} \
     jar_proto $MODDIR $REALPRJNAME \
     $_JAVA_PROTO_SEM \
@@ -1037,7 +1037,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
         LINK_JAR=$_DO_USE_EXT_JAR
     }
     when ($OPENSOURCE_EXPORT == "no") {
-        _BUILD_JAR_SEM=IGNORED
+        _BUILD_JAR_SEM=$_SEM_IGNORED
     }
     when ($_JAR_MAIN_CLASS) {
         _JAR_MAIN_SEM=$_ADD_JAR_MAIN_SEM
diff --git a/build/conf/project_specific/yql_udf.conf b/build/conf/project_specific/yql_udf.conf
index 0f3c1879a5..b2c9d7a7da 100644
--- a/build/conf/project_specific/yql_udf.conf
+++ b/build/conf/project_specific/yql_udf.conf
@@ -176,7 +176,7 @@ module _YQL_UDF_PROGRAM_BASE: SO_PROGRAM {
     _MAKE_YQL_UDF()
 }
 
-UDF_SHARED_SEM=$_CPP_DYN_LIBRARY_SEM
+_UDF_SHARED_SEM=$_CPP_DYN_LIBRARY_SEM
 
 ### @usage: YQL_UDF(name)
 ###
@@ -188,7 +188,7 @@ UDF_SHARED_SEM=$_CPP_DYN_LIBRARY_SEM
 ### @see: [YQL_UDF_MODULE()](#module_YQL_UDF_MODULE)
 multimodule YQL_UDF {
     module YQL_UDF_SHARED: YQL_UDF_MODULE {
-        .SEM=UDF_SHARED_SEM
+        .SEM=_UDF_SHARED_SEM
         CMAKE_TARGET_NAME=${REALPRJNAME}.dyn
         CMAKE_TARGET_ARTEFACT_RENAME_RULES=&& target_properties-ITEM && target_properties-name OUTPUT_NAME && target_properties-value $REALPRJNAME
         NO_CLANG_TIDY()
@@ -196,7 +196,7 @@ multimodule YQL_UDF {
     module YQL_UDF_STATIC: _DLL_COMPATIBLE_LIBRARY {
         .ALIASES=SRCS=GLOBAL_SRCS
         .SEM=_CPP_LIBRARY_SEM
-        .GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM
+        .GLOBAL_SEM=_CPP_OBJ_LIBRARY_SEM
         OBJ_SUF=.udfs
         _ADD_YQL_UDF_DEPS()
         # disable credits generation for static library
@@ -209,7 +209,7 @@ multimodule YQL_UDF {
 
 multimodule YQL_UDF_YDB {
     module YQL_UDF_SHARED: YQL_UDF_YDB_MODULE {
-        .SEM=UDF_SHARED_SEM
+        .SEM=_UDF_SHARED_SEM
         CMAKE_TARGET_NAME=${REALPRJNAME}.dyn
         CMAKE_TARGET_ARTEFACT_RENAME_RULES=&& target_properties-ITEM && target_properties-name OUTPUT_NAME && target_properties-value $REALPRJNAME
         NO_CLANG_TIDY()
@@ -217,7 +217,7 @@ multimodule YQL_UDF_YDB {
     module YQL_UDF_STATIC: _DLL_COMPATIBLE_LIBRARY {
         .ALIASES=SRCS=GLOBAL_SRCS
         .SEM=_CPP_LIBRARY_SEM
-        .GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM
+        .GLOBAL_SEM=_CPP_OBJ_LIBRARY_SEM
         OBJ_SUF=.udfs
         _ADD_YQL_UDF_YDB_DEPS()
         # disable credits generation for static library
@@ -230,13 +230,13 @@ multimodule YQL_UDF_YDB {
 
 multimodule YQL_UDF_CONTRIB {
     module YQL_UDF_SHARED: YQL_UDF_MODULE_CONTRIB {
-        .SEM=UDF_SHARED_SEM
+        .SEM=_UDF_SHARED_SEM
         NO_CLANG_TIDY()
     }
     module YQL_UDF_STATIC: _DLL_COMPATIBLE_LIBRARY {
         .ALIASES=SRCS=GLOBAL_SRCS
         .SEM=_CPP_LIBRARY_SEM
-        .GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM
+        .GLOBAL_SEM=_CPP_OBJ_LIBRARY_SEM
         OBJ_SUF=.udfs
         _ADD_YQL_UDF_DEPS_CONTRIB()
         # disable credits generation for static library
diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index b415e0687f..f9781b588f 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -145,7 +145,7 @@ macro NO_OPTIMIZE_PY_PROTOS() {
 # tag:proto tag:python-specific
 macro _PROTO_PLUGIN_ARGS_BASE(Name, Tool, OutParm...) {
     .CMD=--plugin=protoc-gen-${Name}=\${tool:"$Tool"} --${Name}_out=$ARCADIA_BUILD_ROOT/\$PROTO_NAMESPACE ${pre=--${Name}_opt=:OutParm}
-    .SEM=IGNORED
+    .SEM=$_SEM_IGNORED
 }
 
 # tag:proto tag:python-specific
@@ -181,6 +181,7 @@ macro PY_PROTO_PLUGIN2(NAME, EXT1, EXT2, TOOL, DEPS[]) {
 # tag:proto tag:java-specific
 macro _JAVA_PROTO_PLUGIN_ARGS_BASE(Name, Tool, OutParm...) {
     .CMD=--plugin=protoc-gen-${Name}=\${tool:"$Tool"} --${Name}_out=$ARCADIA_BUILD_ROOT/java_out
+    .SEM=$_SEM_IGNORED
 }
 
 # tag:proto tag:java-specific
@@ -649,7 +650,7 @@ NEED_GOOGLE_PROTO_PEERDIRS=yes
 
 _CPP_PROTO_LIBRARY_SEM=$_CPP_LIBRARY_SEM
 
-_JAVA_PROTO_LIBRARY_SEM=$BUILD_PROTO_JAR_SEM $_GRADLE_EXPORT_PUBLISHING_SEM
+_JAVA_PROTO_LIBRARY_SEM=$_BUILD_PROTO_JAR_SEM $_GRADLE_EXPORT_PUBLISHING_SEM
 
 module _CPP_PROTO : LIBRARY {
     .ALLOWED=_EXPOSE LIST_PROTO
@@ -822,11 +823,13 @@ multimodule PROTO_LIBRARY {
     module CPP_PROTO: _CPP_PROTO {
         # TODO(svidyuk): think about marker which forces semantics inheritance
         .SEM=_CPP_PROTO_LIBRARY_SEM
+        .GLOBAL_SEM=_CPP_PROTO_LIBRARY_SEM
         SET_APPEND(PEERDIR_TAGS CPP_PROTO)
     }
 
     module JAVA_PROTO: _JAVA_PROTO {
         .SEM=_JAVA_PROTO_LIBRARY_SEM
+        .GLOBAL_SEM=_JAVA_PROTO_LIBRARY_SEM
         SET_APPEND(PEERDIR_TAGS JAVA_PROTO)
     }
 
@@ -902,12 +905,14 @@ multimodule PROTO_SCHEMA {
     module CPP_PROTO_FROM_SCHEMA: _CPP_PROTO {
         # TODO(svidyuk): think about marker which forces semantics inheritance
         .SEM=_CPP_PROTO_LIBRARY_SEM
+        .GLOBAL_SEM=_CPP_PROTO_LIBRARY_SEM
         DISABLE(START_TARGET)
         SET_APPEND(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA)
     }
 
     module JAVA_PROTO_FROM_SCHEMA: _JAVA_PROTO {
         .SEM=_JAVA_PROTO_LIBRARY_SEM
+        .GLOBAL_SEM=_JAVA_PROTO_LIBRARY_SEM
         DISABLE(START_TARGET)
         SET_APPEND(PEERDIR_TAGS JAVA_PROTO JAVA_PROTO_FROM_SCHEMA)
     }
diff --git a/build/conf/python.conf b/build/conf/python.conf
index 8aab5de8eb..1552260016 100644
--- a/build/conf/python.conf
+++ b/build/conf/python.conf
@@ -1117,7 +1117,7 @@ multimodule PY23_NATIVE_LIBRARY {
         .RESTRICTED=PY_SRCS USE_PYTHON2 USE_PYTHON3 RUN_ANTLR4_PYTHON
         .ALIASES=PYTHON2_ADDINCL=PYTHON3_ADDINCL
         .SEM=_CPP_LIBRARY_SEM
-        .GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM
+        .GLOBAL_SEM=_CPP_OBJ_LIBRARY_SEM
         PYTHON3_ADDINCL()
         SET(MODULE_LANG PY3)
         when ($MSVC == "yes" || $CYGWIN == "yes") {
diff --git a/build/conf/swig.conf b/build/conf/swig.conf
index 0c3c2d08ff..2dcb707af4 100644
--- a/build/conf/swig.conf
+++ b/build/conf/swig.conf
@@ -62,10 +62,10 @@ macro _JNI_JAVA_SWIG_SRCS(Srcs...) {
     SRCS(${ext=.java:Srcs} ${ext=.swg:Srcs})
 }
 
-SWIG_JNI_BINDINGS_SEM= \
+_SWIG_JNI_BINDINGS_SEM= \
     add_swig_jni_library ${MODDIR} ${REALPRJNAME}-cpp GEN_JAVA_FILES_LIST ${"$"}{CMAKE_CURRENT_BINARY_DIR}/swig_gen_java.lst SOURCES ${_EXPLICIT_SWIG_IFACE_SOURCES} && \
     target_properties-ITEM && target_properties-name OUTPUT_NAME && target_properties-value $REALPRJNAME && \
-    ${VCS_INFO_SEM} && \
+    ${_VCS_INFO_SEM} && \
     target_options-publics-ITEM && target_options-publics-option target_include_directories && target_options-publics-args $_C__INCLUDE_GLOBAL && \
     target_options-privates-ITEM && target_options-privates-option target_include_directories && target_options-privates-args $_C__INCLUDE_OWNED && \
     target_options-privates-ITEM && target_options-privates-option target_compile_options && target_options-privates-args $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS && \
@@ -84,7 +84,7 @@ multimodule DLL_JAVA {
     module JNI_DLL: DLL {
         .ALIASES=SRCS=_JNI_CPP_SWIG_SRCS
         .FINAL_TARGET=no
-        .SEM=SWIG_JNI_BINDINGS_SEM
+        .SEM=_SWIG_JNI_BINDINGS_SEM
         SWIG_LANG=jni_cpp
     }
     module JAR_COMPILATION: EXTERNAL_JAVA_LIBRARY {
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index f8cd4341f5..b3bd862595 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -1210,9 +1210,9 @@ module _BASE_PROGRAM: _LINK_UNIT {
     }
 }
 
-VCS_INFO_SEM=target_macroses-ITEM && target_macroses-macro vcs_info && target_macroses-args ${hide;input:"build/scripts/vcs_info.py"} ${hide;input:"build/scripts/c_templates/svn_interface.c"} ${hide;input:"build/scripts/c_templates/svnversion.h"}
+_VCS_INFO_SEM=target_macroses-ITEM && target_macroses-macro vcs_info && target_macroses-args ${hide;input:"build/scripts/vcs_info.py"} ${hide;input:"build/scripts/c_templates/svn_interface.c"} ${hide;input:"build/scripts/c_templates/svnversion.h"}
 _CPP_PROGRAM_SEM=add_executable $MODDIR $CMAKE_TARGET_NAME ${hide:TARGET} ${hide:AUTO_INPUT} $CMAKE_TARGET_ARTEFACT_RENAME_RULES \
-                && ${VCS_INFO_SEM} \
+                && ${_VCS_INFO_SEM} \
                 && target_options-privates-ITEM && target_options-privates-option target_link_options && target_options-privates-args $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $OBJADDE \
                 && target_options-privates-ITEM && target_options-privates-option target_include_directories && target_options-privates-args $_C__INCLUDE_OWNED \
                 && target_options-privates-ITEM && target_options-privates-option target_compile_options && target_options-privates-args $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS \
@@ -1827,7 +1827,7 @@ _CPP_LIBRARY_SEM=add_library ${MODDIR} $CMAKE_TARGET_NAME ${hide:TARGET} ${hide:
                 && target_options-interfaces-ITEM && target_options-interfaces-option target_link_options && target_options-interfaces-args $LDFLAGS_GLOBAL_RAW \
                 && project_languages C && project_languages CXX \
                 && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${MODULE_EXPLICIT_HEADERS}
-CPP_OBJ_LIBRARY_SEM=add_global_library_for ${MODDIR} ${suf=.global:CMAKE_TARGET_NAME} $CMAKE_TARGET_NAME ${hide:GLOBAL_TARGET} ${hide:AUTO_INPUT} \
+_CPP_OBJ_LIBRARY_SEM=add_global_library_for ${MODDIR} ${suf=.global:CMAKE_TARGET_NAME} $CMAKE_TARGET_NAME ${hide:GLOBAL_TARGET} ${hide:AUTO_INPUT} \
                 && target_options-publics-ITEM && target_options-publics-option target_include_directories && target_options-publics-args $_C__INCLUDE_GLOBAL \
                 && target_options-privates-ITEM && target_options-privates-option target_include_directories && target_options-privates-args $_C__INCLUDE_OWNED \
                 && target_options-privates-ITEM && target_options-privates-option target_compile_options && target_options-privates-args $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS \
@@ -1853,7 +1853,7 @@ module LIBRARY: _LIBRARY {
     .GLOBAL=_AARS _PROGUARD_RULES
     .SEM=_CPP_LIBRARY_SEM
     .ALIASES=EXTRALIBS=PY_EXTRALIBS
-    .GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM
+    .GLOBAL_SEM=_CPP_OBJ_LIBRARY_SEM
     .DEFAULT_NAME_GENERATOR=ThreeDirNames
     .ARGS_PARSER=Base
 
@@ -1861,7 +1861,7 @@ module LIBRARY: _LIBRARY {
         _CPP_LIBRARY_SEM=$CMAKE_PACKAGE_SEM && ${CPP_LIBRARY_INDUCED_LINKS} $CMAKE_LINK_TARGET $CONAN_REQUIRES_SEM $CONAN_OPTIONS_SEM $CONAN_OS_REQUIRES_SEM $CONAN_OS_OPTIONS_SEM && IGNORED
     }
     when ($OPENSOURCE_EXPORT == "no") {
-        _CPP_LIBRARY_SEM=IGNORED
+        _CPP_LIBRARY_SEM=$_SEM_IGNORED
     }
 
     when ($HAS_CPP_PROTOBUF_PEERS == "yes") {
@@ -2028,7 +2028,7 @@ _SONAME=
 _EXPORT_SCRIPT_SEM=
 _CLEAN_TEXTREL=
 macro _ADD_DYNLYB_SEM(Libname) {
-    .SEM=add_shared_library ${MODDIR} ${Libname} ${hide:TARGET} ${hide:AUTO_INPUT} && target_options-publics-ITEM && target_options-publics-option target_include_directories && target_options-publics-args $_C__INCLUDE_GLOBAL && target_options-privates-ITEM && target_options-privates-option target_include_directories && target_options-privates-args $_C__INCLUDE_OWNED && target_options-privates-ITEM && target_options-privates-option target_compile_options && target_options-privates-args $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS && target_options-publics-ITEM && target_options-publics-option target_compile_options && target_options-publics-args $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW && target_options-privates-ITEM && target_options-privates-option target_link_options && target_options-privates-args $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $OBJADDE && ${VCS_INFO_SEM} $_EXPORT_SCRIPT_SEM
+    .SEM=add_shared_library ${MODDIR} ${Libname} ${hide:TARGET} ${hide:AUTO_INPUT} && target_options-publics-ITEM && target_options-publics-option target_include_directories && target_options-publics-args $_C__INCLUDE_GLOBAL && target_options-privates-ITEM && target_options-privates-option target_include_directories && target_options-privates-args $_C__INCLUDE_OWNED && target_options-privates-ITEM && target_options-privates-option target_compile_options && target_options-privates-args $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS && target_options-publics-ITEM && target_options-publics-option target_compile_options && target_options-publics-args $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW && target_options-privates-ITEM && target_options-privates-option target_link_options && target_options-privates-args $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $OBJADDE && ${_VCS_INFO_SEM} $_EXPORT_SCRIPT_SEM
 }
 _CPP_DYN_LIBRARY_SEM=$_ADD_DYNLYB_SEM($CMAKE_TARGET_NAME) $CMAKE_TARGET_ARTEFACT_RENAME_RULES
 
@@ -3092,7 +3092,7 @@ macro _SRC("in", SRC, SRCFLAGS...) {
 }
 
 macro MANUAL_GENERATION(Outs...) {
-    .SEM=IGNORED ${hide;noauto;output:Outs}
+    .SEM=$_SEM_IGNORED ${hide;noauto;output:Outs}
 }
 
 # tag:src-processing