From f7169103c870e885ce32619bab6ceda10e5df3d3 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Thu, 5 Jan 2023 21:05:16 +0800 Subject: [PATCH] chore: rework cus name --- tools/shell/CMakeLists.txt | 4 ++++ tools/shell/src/shellArguments.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/shell/CMakeLists.txt b/tools/shell/CMakeLists.txt index 1e7d0ed140..f62a5b2204 100644 --- a/tools/shell/CMakeLists.txt +++ b/tools/shell/CMakeLists.txt @@ -26,6 +26,10 @@ ELSE () SET(LINK_WEBSOCKET "") ENDIF () +IF (CUS_NAME OR CUS_PROMPT) + ADD_DEFINITIONS(-I${CMAKE_CURRENT_SOURCE_DIR}/../../../enterprise/packaging) +ENDIF (CUS_NAME) + if(TD_WINDOWS) target_link_libraries(shell PUBLIC taos_static ${LINK_WEBSOCKET}) else() diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c index 111ee76f53..5e532f7351 100644 --- a/tools/shell/src/shellArguments.c +++ b/tools/shell/src/shellArguments.c @@ -21,14 +21,14 @@ #ifndef CUS_NAME char cusName[] = "TDengine"; -#else - char cusName[] = CUS_NAME; #endif #ifndef CUS_PROMPT char cusPrompt[] = "taos"; -#else - char cusPrompt[] = CUS_PROMPT; +#endif + +#if defined(CUS_NAME) || defined(CUS_PROMPT) +#include "cus_name.h" #endif #define TAOS_CONSOLE_PROMPT_CONTINUE " -> "