Build universal binary using ya make

2024-11-27 18:12:02 +00:00 · 2020-05-28 00:58:46 +03:00 · 2020-05-28 00:58:46 +03:00 · 2432ea2c4b
commit 2432ea2c4b
parent dffeec8637
12 changed files with 80 additions and 91 deletions
--- a/programs/client/CMakeLists.txt
+++ b/programs/client/CMakeLists.txt
@ -6,14 +6,9 @@ set(CLICKHOUSE_CLIENT_SOURCES

 set(CLICKHOUSE_CLIENT_LINK PRIVATE clickhouse_common_config clickhouse_functions clickhouse_aggregate_functions clickhouse_common_io clickhouse_parsers string_utils ${Boost_PROGRAM_OPTIONS_LIBRARY})

-include(CheckSymbolExists)
-check_symbol_exists(readpassphrase readpassphrase.h HAVE_READPASSPHRASE)
-configure_file(config_client.h.in ${ConfigIncludePath}/config_client.h)
-
-if(NOT HAVE_READPASSPHRASE)
+# Always use internal readpassphrase
 add_subdirectory(readpassphrase)
 list(APPEND CLICKHOUSE_CLIENT_LINK PRIVATE readpassphrase)
-endif()

 clickhouse_program_add(client)

--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@ -39,7 +39,6 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/typeid_cast.h>
 #include <Common/Config/ConfigProcessor.h>
-#include <Common/config_version.h>
 #include <Core/Types.h>
 #include <Core/QueryProcessingStage.h>
 #include <Core/ExternalTable.h>
@ -77,6 +76,10 @@
 #include <common/argsToConfig.h>
 #include <Common/TerminalSize.h>

+#if !defined(ARCADIA_BUILD)
+#    include <Common/config_version.h>
+#endif
+
 #ifndef __clang__
 #pragma GCC optimize("-fno-var-tracking-assignments")
 #endif
--- a/programs/client/ConnectionParameters.cpp
+++ b/programs/client/ConnectionParameters.cpp
@ -9,7 +9,7 @@
 #include <Common/Exception.h>
 #include <common/setTerminalEcho.h>
 #include <ext/scope_guard.h>
-#include <readpassphrase.h>
+#include "readpassphrase/readpassphrase.h"

 namespace DB
 {
--- a/programs/client/config_client.h.in
+++ b/programs/client/config_client.h.in
@ -1,3 +0,0 @@
-#pragma once
-
-#cmakedefine HAVE_READPASSPHRASE
--- a/programs/client/readpassphrase/CMakeLists.txt
+++ b/programs/client/readpassphrase/CMakeLists.txt
@ -1,13 +1,7 @@
-
 # wget https://raw.githubusercontent.com/openssh/openssh-portable/master/openbsd-compat/readpassphrase.c
 # wget https://raw.githubusercontent.com/openssh/openssh-portable/master/openbsd-compat/readpassphrase.h

-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result -Wno-reserved-id-macro")
+add_library(readpassphrase readpassphrase.c)

-configure_file(includes.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/includes.h)
-add_library(readpassphrase ${CMAKE_CURRENT_SOURCE_DIR}/readpassphrase.c)
-set_target_properties(readpassphrase
-                      PROPERTIES LINKER_LANGUAGE C
-                      )
-# . to allow #include <readpassphrase.h>
-target_include_directories(readpassphrase PUBLIC . ${CMAKE_CURRENT_BINARY_DIR}/include)
+set_target_properties(readpassphrase PROPERTIES LINKER_LANGUAGE C)
+target_compile_options(readpassphrase PRIVATE -Wno-unused-result -Wno-reserved-id-macro)
--- a/programs/client/readpassphrase/includes.h.in
+++ b/programs/client/readpassphrase/includes.h.in
@ -1,6 +1,6 @@
 #pragma once

-#cmakedefine HAVE_READPASSPHRASE
+/* #undef HAVE_READPASSPHRASE */

 #if !defined(HAVE_READPASSPHRASE)
 #    ifndef _PATH_TTY
--- a/programs/client/readpassphrase/readpassphrase.c
+++ b/programs/client/readpassphrase/readpassphrase.c
@ -25,13 +25,11 @@

 #include "includes.h"

-#ifndef HAVE_READPASSPHRASE
-
 #include <termios.h>
 #include <signal.h>
 #include <ctype.h>
 #include <fcntl.h>
-#include <readpassphrase.h>
+#include "readpassphrase.h"
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
@ -193,19 +191,7 @@ restart:
 }
 //DEF_WEAK(readpassphrase);

-#if 0
-char *
-getpass(const char *prompt)
-{
-    static char buf[_PASSWORD_LEN + 1];
-
-    return(readpassphrase(prompt, buf, sizeof(buf), RPP_ECHO_OFF));
-}
-#endif
-
 static void handler(int s)
 {
-
    signo[s] = 1;
 }
-#endif /* HAVE_READPASSPHRASE */
--- a/programs/client/readpassphrase/readpassphrase.h
+++ b/programs/client/readpassphrase/readpassphrase.h
@ -23,20 +23,8 @@
 /* OPENBSD ORIGINAL: include/readpassphrase.h */

 #pragma once
-// #ifndef _READPASSPHRASE_H_
-// #define _READPASSPHRASE_H_

-//#include "includes.h"
-#include "config_client.h"
-
-// Should not be included on BSD systems, but if it happen...
-#ifdef HAVE_READPASSPHRASE
-#   include_next <readpassphrase.h>
-#endif
-
-#ifndef HAVE_READPASSPHRASE
-
-#    ifdef __cplusplus
+#if defined(__cplusplus)
 extern "C" {
 #endif

@ -51,11 +39,6 @@ extern "C" {

 char * readpassphrase(const char *, char *, size_t, int);

-#    ifdef __cplusplus
+#if defined(__cplusplus)
 }
 #endif
-
-
-#endif /* HAVE_READPASSPHRASE */
-
-// #endif /* !_READPASSPHRASE_H_ */
--- a/programs/client/readpassphrase/ya.make
+++ b/programs/client/readpassphrase/ya.make
@ -0,0 +1,7 @@
+LIBRARY()
+
+SRCS(
+    readpassphrase.c
+)
+
+END()
--- a/programs/main.cpp
+++ b/programs/main.cpp
@ -8,12 +8,9 @@
 #include <string>
 #include <utility> /// pair

-#if __has_include("config_tools.h")
+#if !defined(ARCADIA_BUILD)
 #    include "config_tools.h"
 #endif
-#if __has_include("config_core.h")
-#include "config_core.h"
-#endif

 #include <Common/StringUtils/StringUtils.h>

@ -22,31 +19,31 @@


 /// Universal executable for various clickhouse applications
-#if ENABLE_CLICKHOUSE_SERVER || !defined(ENABLE_CLICKHOUSE_SERVER)
+#if ENABLE_CLICKHOUSE_SERVER
 int mainEntryClickHouseServer(int argc, char ** argv);
 #endif
-#if ENABLE_CLICKHOUSE_CLIENT || !defined(ENABLE_CLICKHOUSE_CLIENT)
+#if ENABLE_CLICKHOUSE_CLIENT
 int mainEntryClickHouseClient(int argc, char ** argv);
 #endif
-#if ENABLE_CLICKHOUSE_LOCAL || !defined(ENABLE_CLICKHOUSE_LOCAL)
+#if ENABLE_CLICKHOUSE_LOCAL
 int mainEntryClickHouseLocal(int argc, char ** argv);
 #endif
-#if ENABLE_CLICKHOUSE_BENCHMARK || !defined(ENABLE_CLICKHOUSE_BENCHMARK)
+#if ENABLE_CLICKHOUSE_BENCHMARK
 int mainEntryClickHouseBenchmark(int argc, char ** argv);
 #endif
-#if ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG || !defined(ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
+#if ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
 int mainEntryClickHouseExtractFromConfig(int argc, char ** argv);
 #endif
-#if ENABLE_CLICKHOUSE_COMPRESSOR || !defined(ENABLE_CLICKHOUSE_COMPRESSOR)
+#if ENABLE_CLICKHOUSE_COMPRESSOR
 int mainEntryClickHouseCompressor(int argc, char ** argv);
 #endif
-#if ENABLE_CLICKHOUSE_FORMAT || !defined(ENABLE_CLICKHOUSE_FORMAT)
+#if ENABLE_CLICKHOUSE_FORMAT
 int mainEntryClickHouseFormat(int argc, char ** argv);
 #endif
-#if ENABLE_CLICKHOUSE_COPIER || !defined(ENABLE_CLICKHOUSE_COPIER)
+#if ENABLE_CLICKHOUSE_COPIER
 int mainEntryClickHouseClusterCopier(int argc, char ** argv);
 #endif
-#if ENABLE_CLICKHOUSE_OBFUSCATOR || !defined(ENABLE_CLICKHOUSE_OBFUSCATOR)
+#if ENABLE_CLICKHOUSE_OBFUSCATOR
 int mainEntryClickHouseObfuscator(int argc, char ** argv);
 #endif

@ -60,31 +57,31 @@ using MainFunc = int (*)(int, char**);
 /// Add an item here to register new application
 std::pair<const char *, MainFunc> clickhouse_applications[] =
 {
-#if ENABLE_CLICKHOUSE_LOCAL || !defined(ENABLE_CLICKHOUSE_LOCAL)
+#if ENABLE_CLICKHOUSE_LOCAL
    {"local", mainEntryClickHouseLocal},
 #endif
-#if ENABLE_CLICKHOUSE_CLIENT || !defined(ENABLE_CLICKHOUSE_CLIENT)
+#if ENABLE_CLICKHOUSE_CLIENT
    {"client", mainEntryClickHouseClient},
 #endif
-#if ENABLE_CLICKHOUSE_BENCHMARK || !defined(ENABLE_CLICKHOUSE_BENCHMARK)
+#if ENABLE_CLICKHOUSE_BENCHMARK
    {"benchmark", mainEntryClickHouseBenchmark},
 #endif
-#if ENABLE_CLICKHOUSE_SERVER || !defined(ENABLE_CLICKHOUSE_SERVER)
+#if ENABLE_CLICKHOUSE_SERVER
    {"server", mainEntryClickHouseServer},
 #endif
-#if ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG || !defined(ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
+#if ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
    {"extract-from-config", mainEntryClickHouseExtractFromConfig},
 #endif
-#if ENABLE_CLICKHOUSE_COMPRESSOR || !defined(ENABLE_CLICKHOUSE_COMPRESSOR)
+#if ENABLE_CLICKHOUSE_COMPRESSOR
    {"compressor", mainEntryClickHouseCompressor},
 #endif
-#if ENABLE_CLICKHOUSE_FORMAT || !defined(ENABLE_CLICKHOUSE_FORMAT)
+#if ENABLE_CLICKHOUSE_FORMAT
    {"format", mainEntryClickHouseFormat},
 #endif
-#if ENABLE_CLICKHOUSE_COPIER || !defined(ENABLE_CLICKHOUSE_COPIER)
+#if ENABLE_CLICKHOUSE_COPIER
    {"copier", mainEntryClickHouseClusterCopier},
 #endif
-#if ENABLE_CLICKHOUSE_OBFUSCATOR || !defined(ENABLE_CLICKHOUSE_OBFUSCATOR)
+#if ENABLE_CLICKHOUSE_OBFUSCATOR
    {"obfuscator", mainEntryClickHouseObfuscator},
 #endif
 };
--- a/programs/ya.make
+++ b/programs/ya.make
@ -1,3 +1,27 @@
-RECURSE(
-    server
+PROGRAM(clickhouse)
+
+CFLAGS(
+    -DENABLE_CLICKHOUSE_CLIENT
+    -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
+    -DENABLE_CLICKHOUSE_SERVER
 )
+
+PEERDIR(
+    clickhouse/base/daemon
+    clickhouse/base/loggers
+    clickhouse/programs/client/readpassphrase
+    clickhouse/src
+)
+
+SRCS(
+    main.cpp
+
+    client/Client.cpp
+    client/ConnectionParameters.cpp
+    client/Suggest.cpp
+    extract-from-config/ExtractFromConfig.cpp
+    server/Server.cpp
+    server/MetricsTransmitter.cpp
+)
+
+END()
--- a/src/Common/ya.make
+++ b/src/Common/ya.make
@ -25,6 +25,9 @@ CFLAGS (GLOBAL -DDBMS_VERSION_MINOR=0)
 CFLAGS (GLOBAL -DDBMS_VERSION_PATCH=0)
 CFLAGS (GLOBAL -DVERSION_FULL=\"ClickHouse\")
 CFLAGS (GLOBAL -DVERSION_INTEGER=0)
+CFLAGS (GLOBAL -DVERSION_MAJOR=0)
+CFLAGS (GLOBAL -DVERSION_MINOR=0)
+CFLAGS (GLOBAL -DVERSION_PATCH=0)
 CFLAGS (GLOBAL -DVERSION_NAME=\"ClickHouse\")
 CFLAGS (GLOBAL -DVERSION_OFFICIAL=\"\\\(arcadia\\\)\")
 CFLAGS (GLOBAL -DVERSION_REVISION=0)