Merge pull request #1940 from dcherednik/importlib

Library import 14

build/conf/java.conf

@@ -449,9 +449,11 @@ macro RUN_JAVA_PROGRAM(Args...) {
 # tag:java-specific
 _JAR_ANN_PROCESSORS=
 _JAR_ANN_PROC_OPT_PREFIX=
+_ANN_PROCESSORS_SEM=
 macro JAR_ANNOTATION_PROCESSOR(Classes...) {
     SET_APPEND(_JAR_ANN_PROCESSORS $Classes)
     SET(_JAR_ANN_PROC_OPT_PREFIX -processor)
+    SET_APPEND(_ANN_PROCESSORS_SEM && annotation_processors $Classes)
 
     # for ya ide idea only
     SET_APPEND(ANNOTATION_PROCESSOR_VALUE $ARGS_DELIM $Classes)
@@ -902,6 +904,8 @@ BUILD_JAR_SEM= \
     $_KOTLIN_SEM \
     $_JAR_MAIN_SEM \
     $_GRADLE_EXPORT_PUBLISHING_SEM \
+    $_ANN_PROCESSORS_SEM \
+    $_ENABLE_PREVIEW_SEM \
     $SEM_JAR_SOURCE_SET
 
 BUILD_PROTO_JAR_SEM= \
@@ -911,6 +915,8 @@ BUILD_PROTO_JAR_SEM= \
     && consumer-classpath $EXPORT_GRADLE_CLASSPATH \
     && consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
     && consumer-type library \
+    $_ANN_PROCESSORS_SEM \
+    $_ENABLE_PREVIEW_SEM \
     $_KOTLIN_SEM
 
 # tag:java-specific tag:internal
@@ -1640,6 +1646,7 @@ macro JAVAC_FLAGS(Args...) {
 
 # tag:java-specific
 ENABLE_PREVIEW_VALUE=
+_ENABLE_PREVIEW_SEM=
 ### @usage: ENABLE_PREVIEW()
 ###
 ### Enable java preview features.
@@ -1648,6 +1655,7 @@ macro ENABLE_PREVIEW() {
     SET_APPEND(JAVAC_OPTS --enable-preview --release $JDK_REAL_VERSION)
     SET_APPEND(JAVAC_FLAGS_VALUE --enable-preview --release $JDK_REAL_VERSION)
     SET(ENABLE_PREVIEW_VALUE yes)
+    SET(_ENABLE_PREVIEW_SEM && enable_preview)
 }
 
 # tag:java-specific

build/conf/project_specific/yt.conf

@@ -1,5 +1,5 @@
 macro GENERATE_YT_RECORD(Yaml, OUTPUT_INCLUDES[]) {
     .CMD=${tool:"yt/yt/tools/record_codegen"} --input ${input:Yaml} --output-root $ARCADIA_BUILD_ROOT --output-cpp ${output;norel;noext;suf=.record.cpp:Yaml} ${output;hide;norel;noext;suf=.record.h:Yaml} ${pre=--output-include :OUTPUT_INCLUDES} ${output_include;hide:OUTPUT_INCLUDES} ${output_include;hide:"yt/yt/client/table_client/record_codegen_deps.h"} ${kv;hide:"p RC"}
-    .SEM=find_package Python3 && add_custom_command OUTPUT ${output;norel;noext;suf=.record.cpp:Yaml} ${output;norel;noext;suf=.record.h:Yaml} DEPENDS ${input:Yaml} ${input:"yt/yt/tools/record_codegen/__main__.py"} COMMAND Python3::Interpreter ${input:"yt/yt/tools/record_codegen/__main__.py"} --input ${input:Yaml} --output-root $ARCADIA_BUILD_ROOT --output-cpp ${output;norel;noext;suf=.record.cpp:Yaml} ${pre=--output-include :OUTPUT_INCLUDES} ${output;hide;norel;noext;suf=.record.h:Yaml}
+    .SEM=find_package Python3 && add_custom_command OUTPUT ${output;norel;noext;suf=.record.cpp:Yaml} ${output;norel;noext;suf=.record.h:Yaml} DEPENDS ${input:Yaml} ${input:"yt/yt/tools/record_codegen/__main__.py"} ${input:"yt/python/yt/record_codegen_helpers/__init__.py"} COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=$ENV{PYTHONPATH}:${ARCADIA_ROOT}/yt/python/yt" ${Python3_EXECUTABLE} ${input:"yt/yt/tools/record_codegen/__main__.py"} --input ${input:Yaml} --output-root $ARCADIA_BUILD_ROOT --output-cpp ${output;norel;noext;suf=.record.cpp:Yaml} ${pre=--output-include :OUTPUT_INCLUDES} ${output;hide;norel;noext;suf=.record.h:Yaml}
     PEERDIR(yt/yt/client)
 }

build/conf/sysincl.conf

@@ -2,6 +2,7 @@ SYSINCL=
 SYSINCL+=build/sysincl/macro.yml
 SYSINCL+=build/sysincl/libc-to-compat.yml
 SYSINCL+=build/sysincl/libc-to-nothing.yml
+SYSINCL+=build/sysincl/stl-to-libstdcxx.yml
 SYSINCL+=build/sysincl/stl-to-nothing.yml
 SYSINCL+=build/sysincl/linux.yml
 SYSINCL+=build/sysincl/windows.yml

build/conf/ts/ts_tsc.conf

@@ -37,13 +37,3 @@ multimodule TS_TSC {
         _TS_ADD_NODE_MODULES_FOR_BUILDER()
     }
 }
-
-### @usage: TS_TSC([name])
-###
-### deprecated, use TS_TSC instead
-module TS_LIBRARY: _BARE_UNIT {
-  MESSAGE(TS_LIBRARY has been renamed to TS_TSC)
-  MESSAGE(To update the project edit "ya.make" manualy or run:)
-  MESSAGE(FATAL_ERROR ya project macro replace "TS_LIBRARY=TS_TSC")
-}
-

build/conf/ts/ts_vite.conf

@@ -51,13 +51,3 @@ multimodule TS_VITE {
         _TS_ADD_NODE_MODULES_FOR_BUILDER()
     }
 }
-
-
-### @usage: TS_VITE([name])
-###
-### deprecated, use TS_VITE instead
-module TS_VITE_BUNDLE: _BARE_UNIT {
-  MESSAGE(TS_VITE_BUNDLE has been renamed to TS_VITE)
-  MESSAGE(To update the project edit "ya.make" manualy or run:)
-  MESSAGE(FATAL_ERROR ya project macro replace "TS_VITE_BUNDLE=TS_VITE")
-}

build/conf/ts/ts_webpack.conf

@@ -14,7 +14,7 @@ TS_WEBPACK_CMD=$TOUCH_UNIT \
 
 ### @usage: WEBPACK_OUTPUT(DirName)
 ###
-### Macro sets the output directory name for TS_BUNDLE module.
+### Macro sets the output directory name for TS_WEBPACK module.
 ###
 ### - DirName - output directory name ("bundle" by default).
 macro WEBPACK_OUTPUT(DirName) {
@@ -51,12 +51,3 @@ multimodule TS_WEBPACK {
         _TS_ADD_NODE_MODULES_FOR_BUILDER()
     }
 }
-
-### @usage: TS_TSC([name])
-###
-### deprecated, use TS_TSC instead
-module TS_BUNDLE: _BARE_UNIT {
-  MESSAGE(TS_BUNDLE has been renamed to TS_WEBPACK)
-  MESSAGE(To update the project edit "ya.make" manualy or run:)
-  MESSAGE(FATAL_ERROR ya project macro replace "TS_BUNDLE=TS_WEBPACK")
-}

build/export_generators/gradle/generator.toml

@@ -20,6 +20,8 @@ add_vcs_info_to_mf="bool"
 junit4_test="flag"
 junit5_test="flag"
 app_main_class="str"
+enable_preview="flag"
+annotation_processors="list"
 
 publish="flag"
 publish_group="str"

build/export_generators/hardcoded-cmake/build/scripts/create_recursive_library_for_cmake.py

@@ -130,9 +130,9 @@ class FilesCombiner(object):
             archiver_tool_path = 'libtool'
         elif opts.is_msvc_compatible_linker:
             arch_type = 'LIB'
-        elif re.match('^(|.*/)llvm\-ar(\-[\d])?', opts.parsed_args.cmake_ar):
+        elif re.match(r'^(|.*/)llvm\-ar(\-[\d])?', opts.parsed_args.cmake_ar):
             arch_type = 'LLVM_AR'
-        elif re.match('^(|.*/)(gcc\-)?ar(\-[\d])?', opts.parsed_args.cmake_ar):
+        elif re.match(r'^(|.*/)(gcc\-)?ar(\-[\d])?', opts.parsed_args.cmake_ar):
             arch_type = 'GNU_AR'
         else:
             raise Exception('Unsupported arch type for CMAKE_AR={}'.format(opts.parsed_args.cmake_ar))

build/export_generators/ide-gradle/generator.toml

@@ -22,6 +22,8 @@ junit4_test="flag"
 junit5_test="flag"
 app_main_class="str"
 jar_source_set="list"
+enable_preview="flag"
+annotation_processors="list"
 
 publish="flag"
 publish_group="str"

build/external_resources/yexport/resources.json

@@ -1,13 +1,13 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:5749187505"
+            "uri": "sbr:5811800130"
         },
         "darwin-arm64": {
-            "uri": "sbr:5749179584"
+            "uri": "sbr:5811799864"
         },
         "linux": {
-            "uri": "sbr:5749194772"
+            "uri": "sbr:5811799588"
         }
     }
 }