From e65a4c986a11efc6a09b027b3679a1dd4e27e09e Mon Sep 17 00:00:00 2001
From: MizuhaHimuraki <mocha.java.cchip@gmail.com>
Date: Fri, 1 Oct 2021 00:21:02 +0800
Subject: [PATCH] support liboblog pkg

---
 cmake/RPM.cmake                      | 23 +++++++++++++++--------
 src/liboblog/src/ob_log_instance.cpp |  8 ++++----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/cmake/RPM.cmake b/cmake/RPM.cmake
index 344263b809..edf133d2ec 100644
--- a/cmake/RPM.cmake
+++ b/cmake/RPM.cmake
@@ -48,15 +48,19 @@ install(FILES
   DESTINATION etc
   COMPONENT server)
 
-## oceanbase-sql-parser
+## oceanbase-devel
+# liboblog.so and libob_sql_proxy_parser_static.a
 install(PROGRAMS
+  ${CMAKE_BINARY_DIR}/src/liboblog/src/liboblog.so
+  ${CMAKE_BINARY_DIR}/src/liboblog/src/liboblog.so.1
+  ${CMAKE_BINARY_DIR}/src/liboblog/src/liboblog.so.1.0.0
   ${CMAKE_BINARY_DIR}/src/sql/parser/libob_sql_proxy_parser_static.a
   DESTINATION lib
-  COMPONENT sql-parser
-  EXCLUDE_FROM_ALL
-  )
+  COMPONENT devel)
 
 install(FILES
+  src/liboblog/src/liboblog.h
+  deps/oblib/src/lib/ob_errno.h
   deps/oblib/src/common/sql_mode/ob_sql_mode.h
   src/sql/parser/ob_item_type.h
   src/sql/parser/ob_sql_parser.h
@@ -64,9 +68,12 @@ install(FILES
   src/sql/parser/parser_proxy_func.h
   src/sql/parser/parse_node.h
   DESTINATION include
-  COMPONENT sql-parser
-  EXCLUDE_FROM_ALL
-  )
+  COMPONENT devel)
+
+install(PROGRAMS
+  ${CMAKE_BINARY_DIR}/src/liboblog/tests/oblog_tailf
+  DESTINATION bin
+  COMPONENT devel)
 
 ## oceanbase-libs
 install(PROGRAMS
@@ -99,4 +106,4 @@ add_custom_target(rpm
   COMMAND +make package
   DEPENDS
   observer ob_admin ob_error
-  ob_sql_proxy_parser_static)
\ No newline at end of file
+  ob_sql_proxy_parser_static)
diff --git a/src/liboblog/src/ob_log_instance.cpp b/src/liboblog/src/ob_log_instance.cpp
index 0b3ee69d9e..97ec31d13e 100644
--- a/src/liboblog/src/ob_log_instance.cpp
+++ b/src/liboblog/src/ob_log_instance.cpp
@@ -399,11 +399,11 @@ int ObLogInstance::init_logger_()
     }
 
     _LOG_INFO("====================liboblog start====================");
-    _LOG_INFO("liboblog %s %s", PACKAGE_VERSION, RELEASEID);
+    _LOG_INFO("liboblog CE %s %s", PACKAGE_VERSION, RELEASEID);
     _LOG_INFO("BUILD_VERSION: %s", build_version());
     _LOG_INFO("BUILD_TIME: %s %s", build_date(), build_time());
     _LOG_INFO("BUILD_FLAGS: %s", build_flags());
-    _LOG_INFO("Copyright (c) 2007-2016 Alipay Inc.");
+    _LOG_INFO("Copyright (c) 2021 Ant Group Co., Ltd.");
     _LOG_INFO("======================================================");
     _LOG_INFO("\n");
   }
@@ -415,11 +415,11 @@ int ObLogInstance::init_logger_()
 
 void ObLogInstance::print_version()
 {
-  MPRINT("liboblog %s %s", PACKAGE_VERSION, RELEASEID);
+  MPRINT("liboblog CE %s %s", PACKAGE_VERSION, RELEASEID);
   MPRINT("REVISION: %s", build_version());
   MPRINT("BUILD_TIME: %s %s", build_date(), build_time());
   MPRINT("BUILD_FLAGS: %s\n", build_flags());
-  MPRINT("Copyright (c) 2007-2016 Alipay Inc.");
+  MPRINT("Copyright (c) 2021 Ant Group Co., Ltd.");
   MPRINT();
 }
 
-- 
GitLab