File tree Expand file tree Collapse file tree 7 files changed +19
-7
lines changed Expand file tree Collapse file tree 7 files changed +19
-7
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,10 @@ set(YDB_SDK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
1616set (YDB_SDK_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} )
1717set (YDB-CPP-SDK_AVAILABLE_COMPONENTS "" CACHE INTERNAL "" )
1818set (YDB-CPP-SDK_COMPONENT_TARGETS "" CACHE INTERNAL "" )
19- file (READ "src/client/resources/ydb_sdk_version.txt" YDB_SDK_VERSION)
19+ file (READ "src/version.h" YDB_SDK_VERSION_FILE_RAW)
20+ string (REGEX MATCH "YDB_SDK_VERSION = \" ([0-9]+\\ .[0-9]+\\ .[0-9]+)\" " _ ${YDB_SDK_VERSION_FILE_RAW} )
21+ set (YDB_SDK_VERSION ${CMAKE_MATCH_1} )
22+ message (STATUS "YDB С++ SDK version: ${YDB_SDK_VERSION} " )
2023
2124#[=============================================================================[
2225 NOTE: if `ccache` is used with the environment variable `CCACHE_BASEDIR`,
Original file line number Diff line number Diff line change 33#include < string>
44
55namespace NYdb {
6- inline namespace Dev {
6+ inline namespace V3 {
77
88using TStringType = std::string;
99
Original file line number Diff line number Diff line change @@ -19,10 +19,8 @@ target_sources(client-resources.global PRIVATE
1919resources(client-resources.global
2020 ${YDB_SDK_BINARY_DIR} /src/client/resources/6ed212bf45019efe2a5e72b6d5ed50fb.cpp
2121 INPUTS
22- ${YDB_SDK_SOURCE_DIR} /src/client/resources/ydb_sdk_version.txt
2322 ${YDB_SDK_SOURCE_DIR} /src/client/resources/ydb_root_ca.pem
2423 KEYS
25- ydb_sdk_version_v3.txt
2624 ydb_root_ca_v3.pem
2725)
2826
Original file line number Diff line number Diff line change 22
33#include < ydb-cpp-sdk/client/resources/ydb_ca.h>
44
5+ #include < src/version.h>
6+
57namespace NYdb ::inline V3 {
68
79std::string GetRootCertificate () {
8- return NResource::Find (" ydb_root_ca_dev.pem " );
10+ return NResource::Find (YDB_CERTIFICATE_FILE_KEY );
911}
1012
1113} // namespace NYdb
Original file line number Diff line number Diff line change 22
33#include < ydb-cpp-sdk/client/resources/ydb_resources.h>
44
5+ #include < src/version.h>
6+
57namespace NYdb ::inline V3 {
68
79const char * YDB_AUTH_TICKET_HEADER = " x-ydb-auth-ticket" ;
@@ -29,7 +31,7 @@ const char* YDB_CLIENT_CAPABILITY_SESSION_BALANCER = "session-balancer";
2931
3032
3133std::string GetSdkSemver () {
32- return NResource::Find ( " ydb_sdk_version_dev.txt " ) ;
34+ return YDB_SDK_VERSION ;
3335}
3436
3537} // namespace NYdb
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1+ #pragma once
2+
3+ namespace NYdb {
4+
5+ inline const char * YDB_SDK_VERSION = " 3.3.0" ;
6+ inline const char * YDB_CERTIFICATE_FILE_KEY = " ydb_root_ca_v3.pem" ;
7+
8+ } // namespace NYdb
You can’t perform that action at this time.
0 commit comments