Fix CMakeLists generation (#15777)

Author: alexv-smirnov

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}

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
 }
 

build/export_generators/cmake/cmake/conan_provider.cmake

@@ -349,23 +349,23 @@ macro(append_compiler_executables_configuration)
     set(_conan_rc_compiler "")
     set(_conan_compilers_list "")
     if(CMAKE_C_COMPILER)
-        set(_conan_c_compiler "\"c\":\"\\\"${CMAKE_C_COMPILER}\\\"\"")
+        set(_conan_c_compiler "\"c\":\"${CMAKE_C_COMPILER}\"")
         set_conan_compiler_if_appleclang(C cc _conan_c_compiler)
         list(APPEND _conan_compilers_list ${_conan_c_compiler})
     else()
         message(WARNING "CMake-Conan: The C compiler is not defined. "
                         "Please define CMAKE_C_COMPILER or enable the C language.")
     endif()
     if(CMAKE_CXX_COMPILER)
-        set(_conan_cpp_compiler "\"cpp\":\"\\\"${CMAKE_CXX_COMPILER}\\\"\"")
+        set(_conan_cpp_compiler "\"cpp\":\"${CMAKE_CXX_COMPILER}\"")
         set_conan_compiler_if_appleclang(CXX c++ _conan_cpp_compiler)
         list(APPEND _conan_compilers_list ${_conan_cpp_compiler})
     else()
         message(WARNING "CMake-Conan: The C++ compiler is not defined. "
                         "Please define CMAKE_CXX_COMPILER or enable the C++ language.")
     endif()
     if(CMAKE_RC_COMPILER)
-        set(_conan_rc_compiler "\"rc\":\"\\\"${CMAKE_RC_COMPILER}\\\"\"")
+        set(_conan_rc_compiler "\"rc\":\"${CMAKE_RC_COMPILER}\"")
         list(APPEND _conan_compilers_list ${_conan_rc_compiler})
         # Not necessary to warn if RC not defined
     endif()

build/ymake.core.conf

@@ -487,8 +487,13 @@ macro CHECK_DEPENDENT_DIRS(TYPE, ALL?"UNUSED":"", PEERDIRS?"PEERDIRS":"ALL", RES
     SET_APPEND(CHECK_DEPENDENT_DIRS_TYPES $TYPE)
 }
 
+macro _HASH_HELPER(Args...) {
+    .CMD=${hash:Args}
+    .SEM=${hash:Args}
+}
+
 macro _RESOURCE_SEM(INPUTS[], KEYS[], OPTS[]) {
-    SET(RESOURCE_OUTPUT ${hash:INPUTS}.cpp)
+    SET(RESOURCE_OUTPUT $_HASH_HELPER($INPUTS $KEYS $OPTS).cpp)
     .SEM=target_macroses-ITEM && target_macroses-macro resources && target_macroses-args ${output;global:RESOURCE_OUTPUT} INPUTS ${input:INPUTS} KEYS $KEYS OPTS $OPTS ${hide;tool:"tools/rescompiler/bin"}
 }
 
@@ -2259,12 +2264,14 @@ macro DYNAMIC_DEPS(Path...) {
 ### for seamless testing and packaging
 multimodule DYNAMIC_LIBRARY {
     module DLL_BIN: DLL {
+        .SEM=_CPP_DYN_LIBRARY_SEM
         .PROXY=yes
         .IGNORED=PROVIDES
         SET(MODULE_TAG DLL)
     }
     module DLL_LIB: _DLL_COMPATIBLE_LIBRARY {
         .CMD=$TOUCH_UNIT_MF
+        .SEM=_SEM_IGNORED
         .PEERDIRSELF=DLL_BIN
         .IGNORED=SRCS PEERDIR RUN_PROGRAM PYTHON DYNAMIC_LIBRARY_FROM GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER USE_PYTHON2 USE_PYTHON3
         .ALLOWED=DYNAMIC_DEPS
@@ -4510,7 +4517,7 @@ macro DECLARE_IN_DIRS(var_prefix, PATTERN, SRCDIR="", RECURSIVE?"**/":"", EXCLUD
 ### @usage: RUN_PROGRAM(tool_path args... [CWD dir] [ENV key=value...] [TOOL tools...] [IN[_NOPARSE] inputs...] [OUT[_NOAUTO] outputs...] [STDOUT[_NOAUTO] output] [OUTPUT_INCLUDES output_includes...] [INDUCED_DEPS $VARs...])
 ###
 ### Run a program from arcadia.
-### These macros are similar: RUN_PROGRAM, RUN_LUA, PYTHON.
+### These macros are similar: RUN_PYTHON3, RUN_LUA, PYTHON.
 ###
 ### Parameters:
 ### - tool_path - Path to the directory of the tool.
@@ -4584,6 +4591,34 @@ macro RUN_PYTHON3(ScriptPath, IN{input}[], IN_NOPARSE{input}[], OUT{output}[], O
     .SEM=custom_runs-ITEM && custom_runs-depends ${input:IN} ${context=TEXT;input:IN_NOPARSE} ${input:ScriptPath} ${tool:TOOL} ${pre=&& custom_runs-env :ENV} && custom_runs-command python3 ${input:ScriptPath} $Args ${pre=> :STDOUT} ${pre=> :STDOUT_NOAUTO} && custom_runs-outputs ${output:OUT} ${noauto;output:OUT_NOAUTO} ${output:STDOUT} ${noauto;output:STDOUT_NOAUTO} ${pre=&& custom_runs-cwd :CWD} && custom_runs-cmake_packages-ITEM && custom_runs-cmake_packages-name Python3
 }
 
+### @usage: RUN_PY3_PROGRAM(tool_path args... [CWD dir] [ENV key=value...] [TOOL tools...] [IN[_NOPARSE] inputs...] [OUT[_NOAUTO] outputs...] [STDOUT[_NOAUTO] output] [OUTPUT_INCLUDES output_includes...] [INDUCED_DEPS $VARs...])
+###
+### When build by ya make - Run a program from arcadia.
+### When exporting to other build systems (Cmake, Gradle, ...) - Run a python script __main__.py in tool project. Of course,
+### for exporting __main__.py must exists in tool project and must support execute by system Python3
+### These macros are similar: RUN_PROGRAM, RUN_PYTHON3, RUN_LUA, PYTHON.
+###
+### Parameters:
+### - tool_path - Path to the directory of the tool.
+### - args... - Program arguments. Relative paths listed in TOOL, IN, OUT, STDOUT become absolute.
+### - CWD dir - Absolute path of the working directory.
+### - ENV key=value... - Environment variables.
+### - TOOL tools... - Auxiliary tool directories.
+### - IN[_NOPARSE] inputs... - Input files. NOPARSE inputs are treated as textual and not parsed for dependencies regardless of file extensions.
+### - OUT[_NOAUTO] outputs... - Output files. NOAUTO outputs are not automatically added to the build process.
+### - STDOUT[_NOAUTO] output - Redirect the standard output to the output file.
+### - OUTPUT_INCLUDES output_includes... - Includes of the output files that are needed to build them.
+### - INDUCED_DEPS $VARs... - Dependencies for generated files. Unlike `OUTPUT_INCLUDES` these may target files further in processing chain.
+###                           In order to do so VAR should be filled by PREPARE_INDUCED_DEPS macro, stating target files (by type) and set of dependencies
+###
+### For absolute paths use ${ARCADIA_ROOT} and ${ARCADIA_BUILD_ROOT}, or
+### ${CURDIR} and ${BINDIR} which are expanded where the outputs are used.
+### Note that Tool is always built for the host platform, so be careful to provide that tool can be built for all Arcadia major host platforms (Linux, MacOS and Windows).
+macro RUN_PY3_PROGRAM(Tool, IN{input}[], IN_NOPARSE{input}[], OUT{output}[], OUT_NOAUTO{output}[], TOOL{tool}[], OUTPUT_INCLUDES[], INDUCED_DEPS[], STDOUT="", STDOUT_NOAUTO="", CWD="", ENV[], Args...) {
+    .CMD=$RUN_PROGRAM($Tool                               $Args ${pre=IN :IN} ${pre=IN_NOPARSE :IN_NOPARSE} ${pre=OUT :OUT} ${pre=OUT_NOAUTO :OUT_NOAUTO} ${pre=TOOL :TOOL} ${pre=OUTPUT_INCLUDES :OUTPUT_INCLUDES} ${pre=INDUCED_DEPS :INDUCED_DEPS} ${pre=STDOUT :STDOUT} ${pre=STDOUT_NOAUTO :STDOUT_NOAUTO} ${pre=CWD :CWD} ${pre=ENV :ENV})
+    .SEM=$RUN_PYTHON3(${ARCADIA_ROOT}/${Tool}/__main__.py $Args ${pre=IN :IN} ${pre=IN_NOPARSE :IN_NOPARSE} ${pre=OUT :OUT} ${pre=OUT_NOAUTO :OUT_NOAUTO} ${pre=TOOL :TOOL} ${pre=OUTPUT_INCLUDES :OUTPUT_INCLUDES} ${pre=INDUCED_DEPS :INDUCED_DEPS} ${pre=STDOUT :STDOUT} ${pre=STDOUT_NOAUTO :STDOUT_NOAUTO} ${pre=CWD :CWD} ${pre=ENV :ENV})
+}
+
 # tag:java-specific
 macro _RUN_ANTLR_BASE(IN{input}[], IN_NOPARSE{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], INDUCED_DEPS[], TOOL[], STDOUT="", STDOUT_NOAUTO="", CWD="", JAR[], SEM="run_java", ENV[], HIDE_OUTPUT?"stderr2stdout":"stdout2stderr", Args...) {
     PEERDIR(build/platform/java/jdk $JDK_RESOURCE_PEERDIR)

generate_cmake

@@ -185,7 +185,7 @@ if __name__ == "__main__":
 
         # In original script there are targets kikimr/docs/ru/docs_oss ydb ydb/tests/oss/launch library/cpp/actors tools/rescompiler/bin
         generate_graph_command = f'{ymake_binary_path} --build-root "{ydb_tmp_folder_path}" --config "{dump_export_path}"\
-            --plugins-root "{plugins_folder_path}" --xs --xx --sem-graph --keep-going\
+            --plugins-root "{plugins_folder_path}" --xs --xx --sem-graph --keep-going --foreign-on-nosem\
             ydb ydb/tests/oss/launch tools/rescompiler/bin > {graph_export_path}'
         print(f"Generate graph command {generate_graph_command}")