Sync branches 250724-0050: rightlib to main

build/conf/java.conf

@@ -441,16 +441,9 @@ macro _JAVA_SRCS(RESOURCES?"yes":"no", SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[],
     _FILL_JAR_GEN_SRCS(JAR_GEN_JSRCS SRC_JAR $SRCDIR ${BINDIR}/cls ${BINDIR}/all-java.srclst $KT_SRCLIST ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt $Globs EXCLUDE $EXCLUDE)
 }
 
-# tag:java-specific tag:deprecated
-# Fill semantic jar_source_set/jar_resource_set by JAVA_SRCS() Args
-_JAR_SOURCE_SET_SEM=
-macro _SEM_JAR_SOURCE_SET(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOURCES?"jar_resource_set":"jar_source_set", SKIP_CHECK_SRCDIR?"SKIP_CHECK_SRCDIR":"", Globs...) {
-    # Now ignore SKIP_CHECK_SRCDIR, EXCLUDE, FILES
-    SET_APPEND(_JAR_SOURCE_SET_SEM && $RESOURCES ${pre=${SRCDIR}\::Globs})
-}
-
 # tag:java-specific
 # Fill semantic source_sets/resource_sets by JAVA_SRCS() Args
+_JAR_SOURCE_SET_SEM=
 macro _SEM_SOURCE_SETS(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOURCES?"resource_sets":"source_sets", SKIP_CHECK_SRCDIR?"SKIP_CHECK_SRCDIR":"", Globs...) {
     # Now ignore SKIP_CHECK_SRCDIR, EXCLUDE, FILES
     SET_APPEND(_JAR_SOURCE_SET_SEM && ${RESOURCES}-ITEM && ${RESOURCES}-dir ${SRCDIR} && ${RESOURCES}-realdir ${SRCDIR} && ${RESOURCES}-globs ${Globs} && ${RESOURCES}-prefix ${PACKAGE_PREFIX})
@@ -460,7 +453,6 @@ macro _SEM_SOURCE_SETS(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOUR
 macro FULL_JAVA_SRCS(Args...) {
     _IDEA_JAVA_SRCS_VALUE($Args)
     _JAVA_SRCS($Args)
-    _SEM_JAR_SOURCE_SET($Args)
     _SEM_SOURCE_SETS($Args)
 }
 
@@ -1914,7 +1906,6 @@ macro JAVA_SRCS(Args...) {
     # TODO Use FULL_JAVA_SRCS
     _IDEA_JAVA_SRCS_VALUE($Args)
     # Fill semantic for non-standard sources/resources
-    _SEM_JAR_SOURCE_SET($Args)
     _SEM_SOURCE_SETS($Args)
 }
 

build/export_generators/cmake/conan_imports.jinja

@@ -5,37 +5,33 @@
 {%-     set srcdir_and_mask = rsplit(search, ",", 2) -%}
 {%-     set srcdir = srcdir_and_mask[0]|trim -%}
 {%-     set mask = srcdir_and_mask[1]|trim -%}
-{%-     if use_conan2 -%}
-{%-         if "bin" in srcdir %}
+{%-     if "bin" in srcdir %}
             {{ shift }}for bindir in dep.cpp_info.bindirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=bindir, dst=self.build_folder + "../../../../{{ dstdir }}")
-{%-             if "swig" in mask %}
+{%-         if "swig" in mask %}
                 # SWIG recipe under Conan2 does not set SWIG_LIB, do it manually here or else build fails
                 if os.path.exists(os.path.join(bindir, "swig")):
                     env = Environment()
                     if not env.vars(self).get("SWIG_LIB"):
                         env.define("SWIG_LIB", os.path.join(bindir, "swiglib"))
-{%-             endif -%}
-{%-         elif "res" in srcdir %}
+{%-         endif -%}
+{%-     elif "res" in srcdir %}
             {{ shift }}for resdir in dep.cpp_info.resdirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=resdir, dst=self.build_folder + "../../../../{{ dstdir }}")
-{%-         elif "build" in srcdir %}
+{%-     elif "build" in srcdir %}
             {{ shift }}for builddir in dep.cpp_info.builddirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=builddir, dst=self.build_folder + "../../../../{{ dstdir }}")
-{%-         elif ("src" in srcdir) or ("source" in srcdir) %}
+{%-     elif ("src" in srcdir) or ("source" in srcdir) %}
             {{ shift }}for srcdir in dep.cpp_info.srcdirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=srcdir, dst=self.build_folder + "../../../../{{ dstdir }}")
-{%-         elif "lib" in srcdir %}
+{%-     elif "lib" in srcdir %}
             {{ shift }}for libdir in dep.cpp_info.libdirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=libdir, dst=self.build_folder + "../../../../{{ dstdir }}")
-{%-         elif "include" in srcdir %}
+{%-     elif "include" in srcdir %}
             {{ shift }}for includedir in dep.cpp_info.includedirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=includedir, dst=self.build_folder + "../../../../{{ dstdir }}")
-{%-         elif "frame" in srcdir %}
+{%-     elif "frame" in srcdir %}
             {{ shift }}for framedir in dep.cpp_info.frameworkdirs:
                 {{ shift }}copy(self, pattern="{{ mask }}", src=framedir, dst=self.build_folder + "../../../../{{ dstdir }}")
-{%-         endif -%}
-{%-     else %}
-        {{ shift }}self.copy(pattern="{{ mask }}", src="{{ srcdir }}", dst="{{ dstdir }}")
 {%-     endif -%}
 {%- endfor -%}

build/export_generators/cmake/conanfile.py.jinja

@@ -1,15 +1,10 @@
-from conan import ConanFile
-
-{%- if use_conan2 %}
-
 import os
 
+from conan import ConanFile
 from conan.tools.files import copy
 from conan.tools.cmake import CMakeToolchain, CMakeDeps, cmake_layout
 from conan.tools.env import Environment
 
-{%- endif %}
-
 
 class App(ConanFile):
 
@@ -70,9 +65,7 @@ class App(ConanFile):
 {%-     endif -%}
 {%- endif -%}
 
-{%- set has_conan_os_depends_imports = conan.os_depends|selectattr('imports')|map(attribute='imports')|sum|length -%}
-
-{%- if use_conan2 %}
+{%- set has_conan_os_depends_imports = conan.os_depends|selectattr('imports')|map(attribute='imports')|sum|length %}
 
     def generate(self):
         CMakeDeps(self).generate()
@@ -101,28 +94,4 @@ class App(ConanFile):
     def layout(self):
         cmake_layout(self)
 
-{%- else %}
-
-    generators = "cmake_find_package", "cmake_paths"
-
-    def imports(self):
-{%- if conan.imports|length -%}
-{%-     set conan_imports = conan.imports -%}
-{%-     set shift = "" -%}
-{%-     include "[generator]/conan_imports.jinja" -%}
-{%- endif -%}
-
-{%- if (has_conan_os_depends_imports) -%}
-{%-     for conan_os_depend in conan.os_depends|selectattr('imports') %}
-{%-         if (conan_os_depend.imports|length) %}
-        if self.settings.os == "{{ conan_os_depend.os }}":
-{%-             set conan_imports = conan_os_depend.imports -%}
-{%-             set shift = "    " -%}
-{%-             include "[generator]/conan_imports.jinja" -%}
-{%-         endif -%}
-{%-     endfor -%}
-{%- endif -%}
-
-{%- endif -%}
-
 {%- include "[generator]/debug_conan.jinja" ignore missing %}

build/export_generators/cmake/generator.toml

@@ -235,8 +235,7 @@ attrs=[
     "conan-options",
     "conan-generators",
 ]
-copy=["cmake/conan1_deprecated.cmake", "cmake/conan_provider.cmake"]
-add_values=[{attr="includes", values=["cmake/conan1_deprecated.cmake"]}]
+copy=["cmake/conan_provider.cmake"]
 
 [[rules]]
 attrs=[

build/export_generators/cmake/root_cmake_lists.jinja

@@ -34,29 +34,10 @@ include(cmake/global_flags.cmake)
 include(cmake/global_vars.cmake)
 {% if includes is defined -%}
 {%     for incl in includes -%}
-{%         if not(use_conan2) or (incl != "cmake/conan1_deprecated.cmake") -%}
 include({{ incl }})
-{%         endif -%}
 {%     endfor -%}
 {%  endif -%}
 
-{%- if (conan.requires or conan.tool_requires) and not(use_conan2) %}
-if (CMAKE_CROSSCOMPILING)
-  include(${PROJECT_BINARY_DIR}/conan_paths.cmake)
-else()
-  conan_cmake_autodetect(settings)
-  conan_cmake_install(
-    PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR}
-    INSTALL_FOLDER ${PROJECT_BINARY_DIR}
-    BUILD missing
-    REMOTE conancenter
-    SETTINGS ${settings}
-    ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}"
-    CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}"
-  )
-endif()
-{% endif -%}
-
 {%- if vanilla_protobuf %}
 
 set(vanilla_protobuf "yes")

build/export_generators/cmake/target_links.jinja

@@ -44,22 +44,14 @@
 {%- if interfaces|length %}
 target_link_libraries({{ name }} INTERFACE
 {%-     for interface in interfaces %}
-{#-         OpenSSL recipe under Conan2 uses another target name, patch it manually here, or else build fails -#}
-{%-         if (use_conan2) and (interface == "OpenSSL::OpenSSL") -%}
-{%-            set interface = "openssl::openssl" -%}
-{%-         endif %}
   {{ interface }}
 {%-     endfor %}
 )
 {%  endif -%}
 
 {%- if publics|length %}
 target_link_libraries({{ name }} PUBLIC
-{%-     for public in publics -%}
-{#-         OpenSSL recipe under Conan2 uses another target name, patch it manually here, or else build fails -#}
-{%-         if (use_conan2) and (public == "OpenSSL::OpenSSL") -%}
-{%-            set public = "openssl::openssl" -%}
-{%-         endif %}
+{%-     for public in publics %}
   {{ public }}
 {%-     endfor %}
 )

build/export_generators/ide-gradle/generator.toml

@@ -34,8 +34,6 @@ is_extra_target = true
 [attrs.target]
 # DEPRECATED
 annotation_processors="list"
-jar_source_set="list"
-jar_resource_set="list"
 
 required_jdk="str"
 add_vcs_info_to_mf="bool"

build/export_generators/ide-gradle/source_sets.jinja

@@ -17,28 +17,8 @@
 {%- endmacro %}
 
 sourceSets {
-{%- set target_jar_source_set = target.jar_source_set|unique -%}
-{%- set target_jar_resource_set = target.jar_resource_set|unique -%}
-{%- if target_jar_source_set|length or target_jar_resource_set|length or target.source_sets|length or target.resource_sets|length or proto_template %}
+{%- if target.source_sets|length or target.resource_sets|length or proto_template %}
     main {
-{#- DEPRECATED vvvvvvvvvvvvvvvv -#}
-{%-     if target_jar_source_set|length and not(target.source_sets|length) -%}
-{%-         for source_set in target_jar_source_set -%}
-{%-             set srcdir_glob = split(source_set, ':') -%}
-{%-             set srcdir = srcdir_glob[0] %}
-        java.srcDir({{ PatchRoots(srcdir) }})
-{%-         endfor -%}
-{%-     endif -%}
-
-{%-     if target_jar_resource_set|length and not(target.resource_sets|length) -%}
-{%-         for resource_set in target_jar_resource_set -%}
-{%-             set resdir_glob = split(resource_set, ':') -%}
-{%-             set resdir = resdir_glob[0] %}
-        resources.srcDir({{ PatchRoots(resdir) }})
-{%-         endfor -%}
-{%-     endif -%}
-{#- DEPRECATED ^^^^^^^^^^^^^^^^ -#}
-
 {%-     if target.source_sets|length -%}
 {%-         for source_set in target.source_sets -%}
 {{ SomeSet(source_set, "java") }}
@@ -73,32 +53,6 @@ sourceSets {
 {%-         if extra_target.test_reldir -%}
 {%-             set reldir = extra_target.test_reldir + "/" -%}
 {%-         endif -%}
-{#- DEPRECATED vvvvvvvvvvvvvvvv -#}
-{%-         if extra_target.jar_source_set|length and not(extra_target.source_sets|length) -%}
-{%-             for source_set in extra_target.jar_source_set|unique -%}
-{%-                 set srcdir_glob = split(source_set, ':', 2) -%}
-{%-                 if srcdir_glob[0][0] == "/" -%}
-{#-                     Absolute path in glob -#}
-{%-                     set srcdir = srcdir_glob[0] -%}
-{%-                 else -%}
-{%-                     set srcdir = reldir + srcdir_glob[0] -%}
-{%-                 endif %}
-        java.srcDir({{ PatchRoots(srcdir) }})
-{%-             endfor -%}
-{%-         endif -%}
-{%-         if extra_target.jar_resource_set|length and not(extra_target.resource_sets|length) -%}
-{%-             for resource_set in extra_target.jar_resource_set|unique -%}
-{%-                 set resdir_glob = split(resource_set, ':', 2) -%}
-{%-                 if resdir_glob[0][0] == "/" -%}
-{#-                     Absolute path in glob -#}
-{%-                     set resdir = resdir_glob[0] -%}
-{%-                 else -%}
-{%-                     set resdir = reldir + resdir_glob[0] -%}
-{%-                 endif %}
-        resources.srcDir({{ PatchRoots(resdir) }})
-{%-             endfor -%}
-{%-         endif -%}
-{#- DEPRECATED ^^^^^^^^^^^^^^^^ -#}
 {%-         for source_set in extra_target.source_sets -%}
 {{ SomeSet(source_set, "java", reldir) }}
 {%-         endfor -%}

contrib/libs/openssl/.yandex_meta/__init__.py

@@ -45,7 +45,7 @@ def d(s):
 
     OPENSOURCE_EXPORT_REPLACEMENT(
         CMAKE OpenSSL
-        CMAKE_TARGET OpenSSL::OpenSSL
+        CMAKE_TARGET openssl::openssl
         CONAN openssl/${OPENSOURCE_REPLACE_OPENSSL}
     )
 

contrib/libs/openssl/ya.make

@@ -12,7 +12,7 @@ IF (OPENSOURCE_REPLACE_OPENSSL AND EXPORT_CMAKE)
 
     OPENSOURCE_EXPORT_REPLACEMENT(
         CMAKE OpenSSL
-        CMAKE_TARGET OpenSSL::OpenSSL
+        CMAKE_TARGET openssl::openssl
         CONAN openssl/${OPENSOURCE_REPLACE_OPENSSL}
     )