Skip to content

Commit 93df2fb

Browse files
ydbotydbot
committed
Merge pull request #21595 from ydb-platform/merge-rightlib-250724-0050
2 parents db28c16 + c8f35eb commit 93df2fb

File tree

30 files changed

+257
-1946
lines changed

30 files changed

+257
-1946
lines changed

‎build/conf/java.conf

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -441,16 +441,9 @@ macro _JAVA_SRCS(RESOURCES?"yes":"no", SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[],
441441
_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)
442442
}
443443

444-
# tag:java-specific tag:deprecated
445-
# Fill semantic jar_source_set/jar_resource_set by JAVA_SRCS() Args
446-
_JAR_SOURCE_SET_SEM=
447-
macro _SEM_JAR_SOURCE_SET(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOURCES?"jar_resource_set":"jar_source_set", SKIP_CHECK_SRCDIR?"SKIP_CHECK_SRCDIR":"", Globs...) {
448-
# Now ignore SKIP_CHECK_SRCDIR, EXCLUDE, FILES
449-
SET_APPEND(_JAR_SOURCE_SET_SEM && $RESOURCES ${pre=${SRCDIR}\::Globs})
450-
}
451-
452444
# tag:java-specific
453445
# Fill semantic source_sets/resource_sets by JAVA_SRCS() Args
446+
_JAR_SOURCE_SET_SEM=
454447
macro _SEM_SOURCE_SETS(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOURCES?"resource_sets":"source_sets", SKIP_CHECK_SRCDIR?"SKIP_CHECK_SRCDIR":"", Globs...) {
455448
# Now ignore SKIP_CHECK_SRCDIR, EXCLUDE, FILES
456449
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
460453
macro FULL_JAVA_SRCS(Args...) {
461454
_IDEA_JAVA_SRCS_VALUE($Args)
462455
_JAVA_SRCS($Args)
463-
_SEM_JAR_SOURCE_SET($Args)
464456
_SEM_SOURCE_SETS($Args)
465457
}
466458

@@ -1914,7 +1906,6 @@ macro JAVA_SRCS(Args...) {
19141906
# TODO Use FULL_JAVA_SRCS
19151907
_IDEA_JAVA_SRCS_VALUE($Args)
19161908
# Fill semantic for non-standard sources/resources
1917-
_SEM_JAR_SOURCE_SET($Args)
19181909
_SEM_SOURCE_SETS($Args)
19191910
}
19201911

‎build/export_generators/cmake/cmake/conan1_deprecated.cmake

Lines changed: 0 additions & 962 deletions
This file was deleted.

‎build/export_generators/cmake/conan_imports.jinja

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,33 @@
55
{%- set srcdir_and_mask = rsplit(search, ",", 2) -%}
66
{%- set srcdir = srcdir_and_mask[0]|trim -%}
77
{%- set mask = srcdir_and_mask[1]|trim -%}
8-
{%- if use_conan2 -%}
9-
{%- if "bin" in srcdir %}
8+
{%- if "bin" in srcdir %}
109
{{ shift }}for bindir in dep.cpp_info.bindirs:
1110
{{ shift }}copy(self, pattern="{{ mask }}", src=bindir, dst=self.build_folder + "../../../../{{ dstdir }}")
12-
{%- if "swig" in mask %}
11+
{%- if "swig" in mask %}
1312
# SWIG recipe under Conan2 does not set SWIG_LIB, do it manually here or else build fails
1413
if os.path.exists(os.path.join(bindir, "swig")):
1514
env = Environment()
1615
if not env.vars(self).get("SWIG_LIB"):
1716
env.define("SWIG_LIB", os.path.join(bindir, "swiglib"))
18-
{%- endif -%}
19-
{%- elif "res" in srcdir %}
17+
{%- endif -%}
18+
{%- elif "res" in srcdir %}
2019
{{ shift }}for resdir in dep.cpp_info.resdirs:
2120
{{ shift }}copy(self, pattern="{{ mask }}", src=resdir, dst=self.build_folder + "../../../../{{ dstdir }}")
22-
{%- elif "build" in srcdir %}
21+
{%- elif "build" in srcdir %}
2322
{{ shift }}for builddir in dep.cpp_info.builddirs:
2423
{{ shift }}copy(self, pattern="{{ mask }}", src=builddir, dst=self.build_folder + "../../../../{{ dstdir }}")
25-
{%- elif ("src" in srcdir) or ("source" in srcdir) %}
24+
{%- elif ("src" in srcdir) or ("source" in srcdir) %}
2625
{{ shift }}for srcdir in dep.cpp_info.srcdirs:
2726
{{ shift }}copy(self, pattern="{{ mask }}", src=srcdir, dst=self.build_folder + "../../../../{{ dstdir }}")
28-
{%- elif "lib" in srcdir %}
27+
{%- elif "lib" in srcdir %}
2928
{{ shift }}for libdir in dep.cpp_info.libdirs:
3029
{{ shift }}copy(self, pattern="{{ mask }}", src=libdir, dst=self.build_folder + "../../../../{{ dstdir }}")
31-
{%- elif "include" in srcdir %}
30+
{%- elif "include" in srcdir %}
3231
{{ shift }}for includedir in dep.cpp_info.includedirs:
3332
{{ shift }}copy(self, pattern="{{ mask }}", src=includedir, dst=self.build_folder + "../../../../{{ dstdir }}")
34-
{%- elif "frame" in srcdir %}
33+
{%- elif "frame" in srcdir %}
3534
{{ shift }}for framedir in dep.cpp_info.frameworkdirs:
3635
{{ shift }}copy(self, pattern="{{ mask }}", src=framedir, dst=self.build_folder + "../../../../{{ dstdir }}")
37-
{%- endif -%}
38-
{%- else %}
39-
{{ shift }}self.copy(pattern="{{ mask }}", src="{{ srcdir }}", dst="{{ dstdir }}")
4036
{%- endif -%}
4137
{%- endfor -%}

‎build/export_generators/cmake/conanfile.py.jinja

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
from conan import ConanFile
2-
3-
{%- if use_conan2 %}
4-
51
import os
62

3+
from conan import ConanFile
74
from conan.tools.files import copy
85
from conan.tools.cmake import CMakeToolchain, CMakeDeps, cmake_layout
96
from conan.tools.env import Environment
107

11-
{%- endif %}
12-
138

149
class App(ConanFile):
1510

@@ -70,9 +65,7 @@ class App(ConanFile):
7065
{%- endif -%}
7166
{%- endif -%}
7267

73-
{%- set has_conan_os_depends_imports = conan.os_depends|selectattr('imports')|map(attribute='imports')|sum|length -%}
74-
75-
{%- if use_conan2 %}
68+
{%- set has_conan_os_depends_imports = conan.os_depends|selectattr('imports')|map(attribute='imports')|sum|length %}
7669

7770
def generate(self):
7871
CMakeDeps(self).generate()
@@ -101,28 +94,4 @@ class App(ConanFile):
10194
def layout(self):
10295
cmake_layout(self)
10396

104-
{%- else %}
105-
106-
generators = "cmake_find_package", "cmake_paths"
107-
108-
def imports(self):
109-
{%- if conan.imports|length -%}
110-
{%- set conan_imports = conan.imports -%}
111-
{%- set shift = "" -%}
112-
{%- include "[generator]/conan_imports.jinja" -%}
113-
{%- endif -%}
114-
115-
{%- if (has_conan_os_depends_imports) -%}
116-
{%- for conan_os_depend in conan.os_depends|selectattr('imports') %}
117-
{%- if (conan_os_depend.imports|length) %}
118-
if self.settings.os == "{{ conan_os_depend.os }}":
119-
{%- set conan_imports = conan_os_depend.imports -%}
120-
{%- set shift = " " -%}
121-
{%- include "[generator]/conan_imports.jinja" -%}
122-
{%- endif -%}
123-
{%- endfor -%}
124-
{%- endif -%}
125-
126-
{%- endif -%}
127-
12897
{%- include "[generator]/debug_conan.jinja" ignore missing %}

‎build/export_generators/cmake/generator.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@ attrs=[
235235
"conan-options",
236236
"conan-generators",
237237
]
238-
copy=["cmake/conan1_deprecated.cmake", "cmake/conan_provider.cmake"]
239-
add_values=[{attr="includes", values=["cmake/conan1_deprecated.cmake"]}]
238+
copy=["cmake/conan_provider.cmake"]
240239

241240
[[rules]]
242241
attrs=[

‎build/export_generators/cmake/root_cmake_lists.jinja

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,10 @@ include(cmake/global_flags.cmake)
3434
include(cmake/global_vars.cmake)
3535
{% if includes is defined -%}
3636
{% for incl in includes -%}
37-
{% if not(use_conan2) or (incl != "cmake/conan1_deprecated.cmake") -%}
3837
include({{ incl }})
39-
{% endif -%}
4038
{% endfor -%}
4139
{% endif -%}
4240

43-
{%- if (conan.requires or conan.tool_requires) and not(use_conan2) %}
44-
if (CMAKE_CROSSCOMPILING)
45-
include(${PROJECT_BINARY_DIR}/conan_paths.cmake)
46-
else()
47-
conan_cmake_autodetect(settings)
48-
conan_cmake_install(
49-
PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR}
50-
INSTALL_FOLDER ${PROJECT_BINARY_DIR}
51-
BUILD missing
52-
REMOTE conancenter
53-
SETTINGS ${settings}
54-
ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}"
55-
CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}"
56-
)
57-
endif()
58-
{% endif -%}
59-
6041
{%- if vanilla_protobuf %}
6142

6243
set(vanilla_protobuf "yes")

‎build/export_generators/cmake/target_links.jinja

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,14 @@
4444
{%- if interfaces|length %}
4545
target_link_libraries({{ name }} INTERFACE
4646
{%- for interface in interfaces %}
47-
{#- OpenSSL recipe under Conan2 uses another target name, patch it manually here, or else build fails -#}
48-
{%- if (use_conan2) and (interface == "OpenSSL::OpenSSL") -%}
49-
{%- set interface = "openssl::openssl" -%}
50-
{%- endif %}
5147
{{ interface }}
5248
{%- endfor %}
5349
)
5450
{% endif -%}
5551

5652
{%- if publics|length %}
5753
target_link_libraries({{ name }} PUBLIC
58-
{%- for public in publics -%}
59-
{#- OpenSSL recipe under Conan2 uses another target name, patch it manually here, or else build fails -#}
60-
{%- if (use_conan2) and (public == "OpenSSL::OpenSSL") -%}
61-
{%- set public = "openssl::openssl" -%}
62-
{%- endif %}
54+
{%- for public in publics %}
6355
{{ public }}
6456
{%- endfor %}
6557
)

‎build/export_generators/ide-gradle/generator.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ is_extra_target = true
3434
[attrs.target]
3535
# DEPRECATED
3636
annotation_processors="list"
37-
jar_source_set="list"
38-
jar_resource_set="list"
3937

4038
required_jdk="str"
4139
add_vcs_info_to_mf="bool"

‎build/export_generators/ide-gradle/source_sets.jinja

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,8 @@
1717
{%- endmacro %}
1818

1919
sourceSets {
20-
{%- set target_jar_source_set = target.jar_source_set|unique -%}
21-
{%- set target_jar_resource_set = target.jar_resource_set|unique -%}
22-
{%- 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 %}
20+
{%- if target.source_sets|length or target.resource_sets|length or proto_template %}
2321
main {
24-
{#- DEPRECATED vvvvvvvvvvvvvvvv -#}
25-
{%- if target_jar_source_set|length and not(target.source_sets|length) -%}
26-
{%- for source_set in target_jar_source_set -%}
27-
{%- set srcdir_glob = split(source_set, ':') -%}
28-
{%- set srcdir = srcdir_glob[0] %}
29-
java.srcDir({{ PatchRoots(srcdir) }})
30-
{%- endfor -%}
31-
{%- endif -%}
32-
33-
{%- if target_jar_resource_set|length and not(target.resource_sets|length) -%}
34-
{%- for resource_set in target_jar_resource_set -%}
35-
{%- set resdir_glob = split(resource_set, ':') -%}
36-
{%- set resdir = resdir_glob[0] %}
37-
resources.srcDir({{ PatchRoots(resdir) }})
38-
{%- endfor -%}
39-
{%- endif -%}
40-
{#- DEPRECATED ^^^^^^^^^^^^^^^^ -#}
41-
4222
{%- if target.source_sets|length -%}
4323
{%- for source_set in target.source_sets -%}
4424
{{ SomeSet(source_set, "java") }}
@@ -73,32 +53,6 @@ sourceSets {
7353
{%- if extra_target.test_reldir -%}
7454
{%- set reldir = extra_target.test_reldir + "/" -%}
7555
{%- endif -%}
76-
{#- DEPRECATED vvvvvvvvvvvvvvvv -#}
77-
{%- if extra_target.jar_source_set|length and not(extra_target.source_sets|length) -%}
78-
{%- for source_set in extra_target.jar_source_set|unique -%}
79-
{%- set srcdir_glob = split(source_set, ':', 2) -%}
80-
{%- if srcdir_glob[0][0] == "/" -%}
81-
{#- Absolute path in glob -#}
82-
{%- set srcdir = srcdir_glob[0] -%}
83-
{%- else -%}
84-
{%- set srcdir = reldir + srcdir_glob[0] -%}
85-
{%- endif %}
86-
java.srcDir({{ PatchRoots(srcdir) }})
87-
{%- endfor -%}
88-
{%- endif -%}
89-
{%- if extra_target.jar_resource_set|length and not(extra_target.resource_sets|length) -%}
90-
{%- for resource_set in extra_target.jar_resource_set|unique -%}
91-
{%- set resdir_glob = split(resource_set, ':', 2) -%}
92-
{%- if resdir_glob[0][0] == "/" -%}
93-
{#- Absolute path in glob -#}
94-
{%- set resdir = resdir_glob[0] -%}
95-
{%- else -%}
96-
{%- set resdir = reldir + resdir_glob[0] -%}
97-
{%- endif %}
98-
resources.srcDir({{ PatchRoots(resdir) }})
99-
{%- endfor -%}
100-
{%- endif -%}
101-
{#- DEPRECATED ^^^^^^^^^^^^^^^^ -#}
10256
{%- for source_set in extra_target.source_sets -%}
10357
{{ SomeSet(source_set, "java", reldir) }}
10458
{%- endfor -%}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def d(s):
4545
4646
OPENSOURCE_EXPORT_REPLACEMENT(
4747
CMAKE OpenSSL
48-
CMAKE_TARGET OpenSSL::OpenSSL
48+
CMAKE_TARGET openssl::openssl
4949
CONAN openssl/${OPENSOURCE_REPLACE_OPENSSL}
5050
)
5151

0 commit comments

Comments
 (0)