Merge pull request #8207 from ydb-platform/mergelibs-240823-1155

Library import 240823-1155

Author: maximyurchuk

build/conf/java.conf

@@ -468,6 +468,17 @@ macro _JAR_ANN_PROC_OPTS(Classes...) {
     .CMD=$_JAR_ANN_PROC_OPT_PREFIX ${join=,:Classes}
 }
 
+# tag:java-specific
+_USE_ANNOTATION_PROCESSOR_OPT=
+_USE_ANNOTATION_PROCESSOR_SEM=
+### @usage: USE_ANNOTATION_PROCESSOR(AnnotationProcessor)
+###
+### Used to specify annotation processor for building JAVA_PROGRAM() and JAVA_LIBRARY().
+macro USE_ANNOTATION_PROCESSOR(AnnotationProcessor) {
+    SET(_USE_ANNOTATION_PROCESSOR_OPT -processorpath @${tool:AnnotationProcessor}.cplist)
+    SET(_USE_ANNOTATION_PROCESSOR_SEM && use_annotation_processor $AnnotationProcessor)
+}
+
 # tag:java-specific
 macro _NOOP_MACRO(Args...) {
     ENABLE(UNUSED_MACRO)
@@ -698,7 +709,7 @@ macro _PACK_JAR_HELPER(Out) {
 
 # tag:java-specific
 macro _JAVAC_RUN_HELPER(JAVAC_CMD_WITH_ARGS...) {
-    .CMD=${cwd:ARCADIA_BUILD_ROOT} ${env:"LC_ALL=en_US.UTF-8"} $YMAKE_PYTHON ${input:"build/scripts/run_javac.py"} ${input;hide:"build/scripts/build_java_with_error_prone2.py"} ${input;hide:"build/scripts/setup_java_tmpdir.py"} --with-setup-java-tmpdir --sources-list ${BINDIR}/all-java.srclst ${RUN_JAVAC_ARGS} ${JAVAC_CMD_WITH_ARGS} @${BINDIR}/all-java.srclst -classpath ${ARCADIA_BUILD_ROOT}/bfg.jar -Xpkginfo:always ${JAVAC_OPTS} $_JAR_ANN_PROC_OPTS($_JAR_ANN_PROCESSORS) -d ${BINDIR}/cls -g -encoding UTF-8
+    .CMD=${cwd:ARCADIA_BUILD_ROOT} ${env:"LC_ALL=en_US.UTF-8"} $YMAKE_PYTHON ${input:"build/scripts/run_javac.py"} ${input;hide:"build/scripts/build_java_with_error_prone2.py"} ${input;hide:"build/scripts/setup_java_tmpdir.py"} --with-setup-java-tmpdir --sources-list ${BINDIR}/all-java.srclst ${RUN_JAVAC_ARGS} ${JAVAC_CMD_WITH_ARGS} @${BINDIR}/all-java.srclst -classpath ${ARCADIA_BUILD_ROOT}/bfg.jar -Xpkginfo:always ${JAVAC_OPTS} ${_USE_ANNOTATION_PROCESSOR_OPT} $_JAR_ANN_PROC_OPTS($_JAR_ANN_PROCESSORS) -d ${BINDIR}/cls -g -encoding UTF-8
 }
 
 # tag:java-specific
@@ -916,6 +927,7 @@ BUILD_JAR_SEM= \
     $_JAR_MAIN_SEM \
     $_GRADLE_EXPORT_PUBLISHING_SEM \
     $_ANN_PROCESSORS_SEM \
+    $_USE_ANNOTATION_PROCESSOR_SEM \
     $_ENABLE_PREVIEW_SEM \
     $SEM_JAR_SOURCE_SET
 
@@ -928,6 +940,7 @@ BUILD_PROTO_JAR_SEM= \
     && consumer-type library \
     $_JAVAC_SEM \
     $_ANN_PROCESSORS_SEM \
+    $_USE_ANNOTATION_PROCESSOR_SEM \
     $_ENABLE_PREVIEW_SEM \
     $_KOTLIN_SEM
 

build/conf/settings.conf

@@ -16,6 +16,7 @@ REPORT_ALL_DUPSRC=yes
 DEPS_CACHE_CONTROL_UIDS_CACHE=yes
 INCLUDE_BLACKLIST_TO_CONF_HASH=no
 INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=yes
+USE_GRAND_BYPASS=no
 USE_GLOBAL_CMD=yes
 YMAKE_USE_NEW_UIDS=yes
 USE_GRAPH_CHANGES_PREDICTOR=yes

build/conf/ts/ts_next.conf

@@ -40,6 +40,7 @@ TS_NEXT_CMD=$TOUCH_UNIT \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
     ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
     ${output;hide:"package.json"} \
+    ${requirements;hide:"cpu:2"} \
     ${kv;hide:"pc magenta"} ${kv;hide:"p TS_NXT"}
 
 ### @usage: TS_NEXT([name])

build/conf/ts/ts_proto.conf

@@ -9,6 +9,7 @@ _TS_PROTO_IMPL_CMD=$TOUCH_UNIT \
         ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
         ${output;hide:"package.json"} \
         ${hide:PROTO_FAKEID} \
+        ${requirements;hide:"cpu:2"} \
         ${kv;hide:"pc magenta"} ${kv;hide:"p TS_PRO"}
 
 

build/conf/ts/ts_tsc.conf

@@ -4,6 +4,7 @@ TS_TSC_CMD=$TOUCH_UNIT \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
     ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
     ${output;hide:"package.json"} \
+    ${requirements;hide:"cpu:2"} \
     ${kv;hide:"pc magenta"} ${kv;hide:"p TS_TSC"}
 
 ### @usage: TS_TSC([name])

build/conf/ts/ts_vite.conf

@@ -42,6 +42,7 @@ TS_VITE_CMD=$TOUCH_UNIT \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
     ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
     ${output;hide:"package.json"} \
+    ${requirements;hide:"cpu:2"} \
     ${kv;hide:"pc magenta"} ${kv;hide:"p TS_VIT"}
 
 ### @usage: TS_VITE([name])

build/conf/ts/ts_webpack.conf

@@ -39,6 +39,7 @@ TS_WEBPACK_CMD=$TOUCH_UNIT \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
     ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
     ${output;hide:"package.json"} \
+    ${requirements;hide:"cpu:2"} \
     ${kv;hide:"pc magenta"} ${kv;hide:"p TS_WPK"}
 
 ### @usage: TS_WEBPACK([name])

build/export_generators/cmake/dir_targets.jinja

@@ -63,8 +63,13 @@
 {{ RenderTargetOptions(target_name, prefix, target_options.publics, only_option, exclude_options) }}
 {%-     endif -%}
 
-{%-     if not(is_really_fake_module) and (target_options.privates is defined) -%}
-{{ RenderTargetOptions(target_name, ' PRIVATE', target_options.privates, only_option, exclude_options) }}
+{%-     if (target_options.privates is defined) -%}
+{%-         if is_really_fake_module -%}
+{%-             set prefix = ' INTERFACE' -%}
+{%-         else -%}
+{%-             set prefix = ' PRIVATE' -%}
+{%-         endif -%}
+{{ RenderTargetOptions(target_name, prefix, target_options.privates, only_option, exclude_options) }}
 {%-     endif -%}
 {%- endmacro -%}
 

build/export_generators/cmake/merge_platforms_cmake_lists.jinja

@@ -1,6 +1,6 @@
-{%  include '[generator]/disclaimer.jinja' %}
+{%- include '[generator]/disclaimer.jinja' -%}
 
-{%  if platform_names|length -%}
+{%- if platform_names|length %}
 {%-     for platform_name in platform_names %}
 {%          if not loop.first %}else{% endif %}if ({{ platform_conditions[platform_name] }})
   include(CMakeLists.{{ platform_name }}.txt)

build/export_generators/cmake/target_cmake_lists.jinja

@@ -24,33 +24,29 @@
 {%-         endif -%}
 {%-     endif -%}
 {%-     if target_sources|length -%}
-{%-         for target_source in target_sources -%}
-{%-             if not (target_source.endswith('.h') or target_source.endswith('.hh') or target_source.endswith('.hpp') or target_source.endswith('.i') or target_source.endswith('.inc') or target_source.endswith('.inc.d')) -%}
-{#-                 Any non-header clear flag only_headers_like_sources_library -#}
-{%-                 set only_headers_like_sources_library = false -%}
-{%-             endif -%}
-{%-         endfor -%}
-{%-     else -%}
-{#-         Without target sources flag only_headers_like_sources_library -#}
-{%-         set only_headers_like_sources_library = false -%}
+{%-         set target_sources_non_headers = reject_by_ends(target_sources, ['.h', '.hh', '.hpp']) -%}
+{%-         if (target_sources_non_headers|length) -%}
+{#-             Any non-header clear flag only_headers_like_sources_library -#}
+{%-             set only_headers_like_sources_library = false -%}
+{%-         endif -%}
 {%-     endif -%}
 {%- else -%}
 {%-     set only_headers_like_sources_library = false -%}
 {%- endif -%}
 
-{%- set is_really_fake_module = (current_target.is_fake_module) and not(only_headers_like_sources_library) -%}
+{%- set is_really_fake_module = (current_target.is_fake_module) and (only_headers_like_sources_library) -%}
 
 {{ macro }}({{ name }}
 {%- if current_target.is_fake_module -%}
-{%-     if only_headers_like_sources_library %} STATIC{%- else %} INTERFACE{%- endif -%}
+{%-     if only_headers_like_sources_library %} INTERFACE{%- else %} STATIC{%- endif -%}
 {%- endif -%}
 {%- if macro_args|length > 0 -%}
 {%-     for arg in macro_args %}
   {{ arg }}
 {%-     endfor -%}
 {%- endif -%}
 )
-{% if (current_target.is_fake_module) and (only_headers_like_sources_library) %}
+{% if (current_target.is_fake_module) and not(only_headers_like_sources_library) %}
 set_property(TARGET {{ name }} PROPERTY LINKER_LANGUAGE CXX)
 {%- endif -%}