Move version to separate folder to prevent dependency loops,

Move version

16 files changed, 128 insertions, 46 deletions

diff --git a/ydb/core/driver_lib/CMakeLists.txt b/ydb/core/driver_lib/CMakeLists.txt
index 9282ef217de..f47abb4eef0 100644
--- a/ydb/core/driver_lib/CMakeLists.txt
+++ b/ydb/core/driver_lib/CMakeLists.txt
@@ -11,3 +11,4 @@ add_subdirectory(cli_base)
 add_subdirectory(cli_config_base)
 add_subdirectory(cli_utils)
 add_subdirectory(run)
+add_subdirectory(version)
diff --git a/ydb/core/driver_lib/run/CMakeLists.darwin.txt b/ydb/core/driver_lib/run/CMakeLists.darwin.txt
index 7ef6b50f34b..922b5fa9389 100644
--- a/ydb/core/driver_lib/run/CMakeLists.darwin.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.darwin.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(ut)
 
 add_library(run)
 target_compile_options(run PRIVATE
@@ -54,6 +53,7 @@ target_link_libraries(run PUBLIC
   base_utils
   core-driver_lib-cli_config_base
   cli_utils
+  run
   ydb-core-formats
   ydb-core-grpc_services
   core-grpc_services-base
@@ -145,6 +145,5 @@ target_sources(run PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/main.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/run.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/service_initializer.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/version.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/cert_auth_props.cpp
 )
diff --git a/ydb/core/driver_lib/run/CMakeLists.linux-aarch64.txt b/ydb/core/driver_lib/run/CMakeLists.linux-aarch64.txt
index 5cf45922fa4..c0652f49e72 100644
--- a/ydb/core/driver_lib/run/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.linux-aarch64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(ut)
 
 add_library(run)
 target_compile_options(run PRIVATE
@@ -55,6 +54,7 @@ target_link_libraries(run PUBLIC
   base_utils
   core-driver_lib-cli_config_base
   cli_utils
+  run
   ydb-core-formats
   ydb-core-grpc_services
   core-grpc_services-base
@@ -146,6 +146,5 @@ target_sources(run PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/main.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/run.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/service_initializer.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/version.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/cert_auth_props.cpp
 )
diff --git a/ydb/core/driver_lib/run/CMakeLists.linux.txt b/ydb/core/driver_lib/run/CMakeLists.linux.txt
index 5cf45922fa4..c0652f49e72 100644
--- a/ydb/core/driver_lib/run/CMakeLists.linux.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.linux.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(ut)
 
 add_library(run)
 target_compile_options(run PRIVATE
@@ -55,6 +54,7 @@ target_link_libraries(run PUBLIC
   base_utils
   core-driver_lib-cli_config_base
   cli_utils
+  run
   ydb-core-formats
   ydb-core-grpc_services
   core-grpc_services-base
@@ -146,6 +146,5 @@ target_sources(run PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/main.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/run.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/service_initializer.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/version.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/cert_auth_props.cpp
 )
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
index 97e474e847e..cfedff948a0 100644
--- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
+++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
@@ -1,7 +1,6 @@
 #include "config.h"
 #include "kikimr_services_initializers.h"
 #include "service_initializer.h"
-#include "version.h"
 
 #include <ydb/core/actorlib_impl/destruct_actor.h>
 #include <ydb/core/actorlib_impl/load_network.h>
@@ -45,6 +44,8 @@
 
 #include <ydb/core/control/immediate_control_board_actor.h>
 
+#include <ydb/core/driver_lib/version/version.h>
+
 #include <ydb/core/grpc_services/grpc_mon.h>
 #include <ydb/core/grpc_services/grpc_request_proxy.h>
 
diff --git a/ydb/core/driver_lib/version/CMakeLists.darwin.txt b/ydb/core/driver_lib/version/CMakeLists.darwin.txt
new file mode 100644
index 00000000000..31a0162853b
--- /dev/null
+++ b/ydb/core/driver_lib/version/CMakeLists.darwin.txt
@@ -0,0 +1,22 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(ut)
+
+add_library(run)
+target_link_libraries(run PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-protobuf
+  cpp-actors-interconnect
+  library-cpp-svnversion
+  ydb-core-protos
+)
+target_sources(run PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/version.cpp
+)
diff --git a/ydb/core/driver_lib/version/CMakeLists.linux-aarch64.txt b/ydb/core/driver_lib/version/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..1f6c48a7569
--- /dev/null
+++ b/ydb/core/driver_lib/version/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,23 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(ut)
+
+add_library(run)
+target_link_libraries(run PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-protobuf
+  cpp-actors-interconnect
+  library-cpp-svnversion
+  ydb-core-protos
+)
+target_sources(run PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/version.cpp
+)
diff --git a/ydb/core/driver_lib/version/CMakeLists.linux.txt b/ydb/core/driver_lib/version/CMakeLists.linux.txt
new file mode 100644
index 00000000000..1f6c48a7569
--- /dev/null
+++ b/ydb/core/driver_lib/version/CMakeLists.linux.txt
@@ -0,0 +1,23 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(ut)
+
+add_library(run)
+target_link_libraries(run PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-protobuf
+  cpp-actors-interconnect
+  library-cpp-svnversion
+  ydb-core-protos
+)
+target_sources(run PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/version.cpp
+)
diff --git a/ydb/core/driver_lib/run/ut/CMakeLists.txt b/ydb/core/driver_lib/version/CMakeLists.txt
index bede1861df2..bede1861df2 100644
--- a/ydb/core/driver_lib/run/ut/CMakeLists.txt
+++ b/ydb/core/driver_lib/version/CMakeLists.txt
diff --git a/ydb/core/driver_lib/run/ut/CMakeLists.darwin.txt b/ydb/core/driver_lib/version/ut/CMakeLists.darwin.txt
index 7c68428c9f9..8a025aa55c7 100644
--- a/ydb/core/driver_lib/run/ut/CMakeLists.darwin.txt
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.darwin.txt
@@ -7,11 +7,11 @@
 
 
 
-add_executable(ydb-core-driver_lib-run-ut)
-target_include_directories(ydb-core-driver_lib-run-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run
+add_executable(ydb-core-driver_lib-version-ut)
+target_include_directories(ydb-core-driver_lib-version-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version
 )
-target_link_libraries(ydb-core-driver_lib-run-ut PUBLIC
+target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
@@ -19,7 +19,7 @@ target_link_libraries(ydb-core-driver_lib-run-ut PUBLIC
   run
   yql-sql-pg_dummy
 )
-target_link_options(ydb-core-driver_lib-run-ut PRIVATE
+target_link_options(ydb-core-driver_lib-version-ut PRIVATE
   -Wl,-no_deduplicate
   -Wl,-sdk_version,10.15
   -fPIC
@@ -27,21 +27,21 @@ target_link_options(ydb-core-driver_lib-run-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(ydb-core-driver_lib-run-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/version_ut.cpp
+target_sources(ydb-core-driver_lib-version-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/version_ut.cpp
 )
 set_property(
   TARGET
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   TEST_TARGET
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -51,16 +51,16 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   PROPERTY
   PROCESSORS
   1
 )
-vcs_info(ydb-core-driver_lib-run-ut)
+vcs_info(ydb-core-driver_lib-version-ut)
diff --git a/ydb/core/driver_lib/run/ut/CMakeLists.linux-aarch64.txt b/ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt
index b454faa363f..bb7e5aab892 100644
--- a/ydb/core/driver_lib/run/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt
@@ -7,11 +7,11 @@
 
 
 
-add_executable(ydb-core-driver_lib-run-ut)
-target_include_directories(ydb-core-driver_lib-run-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run
+add_executable(ydb-core-driver_lib-version-ut)
+target_include_directories(ydb-core-driver_lib-version-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version
 )
-target_link_libraries(ydb-core-driver_lib-run-ut PUBLIC
+target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
@@ -20,7 +20,7 @@ target_link_libraries(ydb-core-driver_lib-run-ut PUBLIC
   run
   yql-sql-pg_dummy
 )
-target_link_options(ydb-core-driver_lib-run-ut PRIVATE
+target_link_options(ydb-core-driver_lib-version-ut PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -30,21 +30,21 @@ target_link_options(ydb-core-driver_lib-run-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(ydb-core-driver_lib-run-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/version_ut.cpp
+target_sources(ydb-core-driver_lib-version-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/version_ut.cpp
 )
 set_property(
   TARGET
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   TEST_TARGET
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -54,16 +54,16 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   PROPERTY
   PROCESSORS
   1
 )
-vcs_info(ydb-core-driver_lib-run-ut)
+vcs_info(ydb-core-driver_lib-version-ut)
diff --git a/ydb/core/driver_lib/run/ut/CMakeLists.linux.txt b/ydb/core/driver_lib/version/ut/CMakeLists.linux.txt
index 38da8890672..14d06068d31 100644
--- a/ydb/core/driver_lib/run/ut/CMakeLists.linux.txt
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.linux.txt
@@ -7,11 +7,11 @@
 
 
 
-add_executable(ydb-core-driver_lib-run-ut)
-target_include_directories(ydb-core-driver_lib-run-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run
+add_executable(ydb-core-driver_lib-version-ut)
+target_include_directories(ydb-core-driver_lib-version-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version
 )
-target_link_libraries(ydb-core-driver_lib-run-ut PUBLIC
+target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
@@ -22,7 +22,7 @@ target_link_libraries(ydb-core-driver_lib-run-ut PUBLIC
   run
   yql-sql-pg_dummy
 )
-target_link_options(ydb-core-driver_lib-run-ut PRIVATE
+target_link_options(ydb-core-driver_lib-version-ut PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -32,21 +32,21 @@ target_link_options(ydb-core-driver_lib-run-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(ydb-core-driver_lib-run-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/run/version_ut.cpp
+target_sources(ydb-core-driver_lib-version-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/version_ut.cpp
 )
 set_property(
   TARGET
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   TEST_TARGET
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -56,16 +56,16 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-core-driver_lib-run-ut
+  ydb-core-driver_lib-version-ut
   PROPERTY
   PROCESSORS
   1
 )
-vcs_info(ydb-core-driver_lib-run-ut)
+vcs_info(ydb-core-driver_lib-version-ut)
diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.txt b/ydb/core/driver_lib/version/ut/CMakeLists.txt
new file mode 100644
index 00000000000..bede1861df2
--- /dev/null
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/ydb/core/driver_lib/run/version.cpp b/ydb/core/driver_lib/version/version.cpp
index e37ddb87d2a..e37ddb87d2a 100644
--- a/ydb/core/driver_lib/run/version.cpp
+++ b/ydb/core/driver_lib/version/version.cpp
diff --git a/ydb/core/driver_lib/run/version.h b/ydb/core/driver_lib/version/version.h
index 3c8d82f7fa2..3c8d82f7fa2 100644
--- a/ydb/core/driver_lib/run/version.h
+++ b/ydb/core/driver_lib/version/version.h
diff --git a/ydb/core/driver_lib/run/version_ut.cpp b/ydb/core/driver_lib/version/version_ut.cpp
index df1e6b1818b..df1e6b1818b 100644
--- a/ydb/core/driver_lib/run/version_ut.cpp
+++ b/ydb/core/driver_lib/version/version_ut.cpp