aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfedor-miron <fedor-miron@yandex-team.com>2023-11-18 16:07:00 +0300
committerfedor-miron <fedor-miron@yandex-team.com>2023-11-18 16:28:34 +0300
commit6b848da37796ddba34bf3ce284a96ebda36386d0 (patch)
tree602b340ba70f008700c8b19108b751c36a6076aa
parentc3bc7a241fef1fc018de8df71cfc366f93c32e07 (diff)
downloadydb-6b848da37796ddba34bf3ce284a96ebda36386d0.tar.gz
YQL-17123: move cfg/local and fix dependence
-rw-r--r--ydb/library/yql/tools/pgrun/CMakeLists.darwin-x86_64.txt19
-rw-r--r--ydb/library/yql/tools/pgrun/CMakeLists.linux-aarch64.txt19
-rw-r--r--ydb/library/yql/tools/pgrun/CMakeLists.linux-x86_64.txt19
-rw-r--r--ydb/library/yql/tools/pgrun/CMakeLists.windows-x86_64.txt19
-rw-r--r--ydb/library/yql/tools/pgrun/ya.make7
5 files changed, 0 insertions, 83 deletions
diff --git a/ydb/library/yql/tools/pgrun/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/tools/pgrun/CMakeLists.darwin-x86_64.txt
index 3f9820811f..359f46db68 100644
--- a/ydb/library/yql/tools/pgrun/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/tools/pgrun/CMakeLists.darwin-x86_64.txt
@@ -6,12 +6,6 @@
# original buildsystem will not be accepted.
-get_built_tool_path(
- TOOL_rescompiler_bin
- TOOL_rescompiler_dependency
- tools/rescompiler/bin
- rescompiler
-)
add_executable(pgrun)
target_compile_options(pgrun PRIVATE
@@ -46,7 +40,6 @@ target_link_libraries(pgrun PUBLIC
yt-gateway-file
yql-core-url_preprocessing
yql-parser-pg_wrapper
- library-cpp-resource
)
target_link_options(pgrun PRIVATE
-Wl,-platform_version,macos,11.0,11.0
@@ -57,18 +50,6 @@ target_link_options(pgrun PRIVATE
)
target_sources(pgrun PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/tools/pgrun/pgrun.cpp
- ${CMAKE_BINARY_DIR}/ydb/library/yql/tools/pgrun/bad9f76ae5ff92ff1d60596e5ab477d0.cpp
-)
-resources(pgrun
- ${CMAKE_BINARY_DIR}/ydb/library/yql/tools/pgrun/bad9f76ae5ff92ff1d60596e5ab477d0.cpp
- INPUTS
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/gateways.conf
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/fs.conf
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/fs_arc.conf
- KEYS
- gateways.conf
- fs.conf
- fs_arc.conf
)
target_allocator(pgrun
cpp-malloc-jemalloc
diff --git a/ydb/library/yql/tools/pgrun/CMakeLists.linux-aarch64.txt b/ydb/library/yql/tools/pgrun/CMakeLists.linux-aarch64.txt
index 5dcfdb63b4..c88b5ad999 100644
--- a/ydb/library/yql/tools/pgrun/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/tools/pgrun/CMakeLists.linux-aarch64.txt
@@ -6,12 +6,6 @@
# original buildsystem will not be accepted.
-get_built_tool_path(
- TOOL_rescompiler_bin
- TOOL_rescompiler_dependency
- tools/rescompiler/bin
- rescompiler
-)
add_executable(pgrun)
target_compile_options(pgrun PRIVATE
@@ -46,7 +40,6 @@ target_link_libraries(pgrun PUBLIC
yt-gateway-file
yql-core-url_preprocessing
yql-parser-pg_wrapper
- library-cpp-resource
)
target_link_options(pgrun PRIVATE
-ldl
@@ -61,18 +54,6 @@ target_link_options(pgrun PRIVATE
)
target_sources(pgrun PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/tools/pgrun/pgrun.cpp
- ${CMAKE_BINARY_DIR}/ydb/library/yql/tools/pgrun/bad9f76ae5ff92ff1d60596e5ab477d0.cpp
-)
-resources(pgrun
- ${CMAKE_BINARY_DIR}/ydb/library/yql/tools/pgrun/bad9f76ae5ff92ff1d60596e5ab477d0.cpp
- INPUTS
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/gateways.conf
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/fs.conf
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/fs_arc.conf
- KEYS
- gateways.conf
- fs.conf
- fs_arc.conf
)
target_allocator(pgrun
cpp-malloc-jemalloc
diff --git a/ydb/library/yql/tools/pgrun/CMakeLists.linux-x86_64.txt b/ydb/library/yql/tools/pgrun/CMakeLists.linux-x86_64.txt
index c95061b781..a57a34a204 100644
--- a/ydb/library/yql/tools/pgrun/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/tools/pgrun/CMakeLists.linux-x86_64.txt
@@ -6,12 +6,6 @@
# original buildsystem will not be accepted.
-get_built_tool_path(
- TOOL_rescompiler_bin
- TOOL_rescompiler_dependency
- tools/rescompiler/bin
- rescompiler
-)
add_executable(pgrun)
target_compile_options(pgrun PRIVATE
@@ -47,7 +41,6 @@ target_link_libraries(pgrun PUBLIC
yt-gateway-file
yql-core-url_preprocessing
yql-parser-pg_wrapper
- library-cpp-resource
)
target_link_options(pgrun PRIVATE
-ldl
@@ -62,18 +55,6 @@ target_link_options(pgrun PRIVATE
)
target_sources(pgrun PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/tools/pgrun/pgrun.cpp
- ${CMAKE_BINARY_DIR}/ydb/library/yql/tools/pgrun/bad9f76ae5ff92ff1d60596e5ab477d0.cpp
-)
-resources(pgrun
- ${CMAKE_BINARY_DIR}/ydb/library/yql/tools/pgrun/bad9f76ae5ff92ff1d60596e5ab477d0.cpp
- INPUTS
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/gateways.conf
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/fs.conf
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/fs_arc.conf
- KEYS
- gateways.conf
- fs.conf
- fs_arc.conf
)
target_allocator(pgrun
cpp-malloc-jemalloc
diff --git a/ydb/library/yql/tools/pgrun/CMakeLists.windows-x86_64.txt b/ydb/library/yql/tools/pgrun/CMakeLists.windows-x86_64.txt
index 29b9db9bca..23156e952f 100644
--- a/ydb/library/yql/tools/pgrun/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/tools/pgrun/CMakeLists.windows-x86_64.txt
@@ -6,12 +6,6 @@
# original buildsystem will not be accepted.
-get_built_tool_path(
- TOOL_rescompiler_bin
- TOOL_rescompiler_dependency
- tools/rescompiler/bin
- rescompiler
-)
add_executable(pgrun)
target_compile_options(pgrun PRIVATE
@@ -46,22 +40,9 @@ target_link_libraries(pgrun PUBLIC
yt-gateway-file
yql-core-url_preprocessing
yql-parser-pg_wrapper
- library-cpp-resource
)
target_sources(pgrun PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/tools/pgrun/pgrun.cpp
- ${CMAKE_BINARY_DIR}/ydb/library/yql/tools/pgrun/bad9f76ae5ff92ff1d60596e5ab477d0.cpp
-)
-resources(pgrun
- ${CMAKE_BINARY_DIR}/ydb/library/yql/tools/pgrun/bad9f76ae5ff92ff1d60596e5ab477d0.cpp
- INPUTS
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/gateways.conf
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/fs.conf
- ${CMAKE_SOURCE_DIR}/yql/cfg/local/fs_arc.conf
- KEYS
- gateways.conf
- fs.conf
- fs_arc.conf
)
target_allocator(pgrun
system_allocator
diff --git a/ydb/library/yql/tools/pgrun/ya.make b/ydb/library/yql/tools/pgrun/ya.make
index f663021562..db51090bd9 100644
--- a/ydb/library/yql/tools/pgrun/ya.make
+++ b/ydb/library/yql/tools/pgrun/ya.make
@@ -34,13 +34,6 @@ PEERDIR(
ydb/library/yql/parser/pg_wrapper
)
-
-RESOURCE(
-yql/cfg/local/gateways.conf gateways.conf
-yql/cfg/local/fs.conf fs.conf
-yql/cfg/local/fs_arc.conf fs_arc.conf
-)
-
YQL_LAST_ABI_VERSION()
END()