Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
知世而放
oceanbase
提交
fe6827d0
O
oceanbase
项目概览
知世而放
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fe6827d0
编写于
10月 12, 2021
作者:
X
xh0
提交者:
wangzelin.wzl
10月 12, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: rpm package for liboblog
上级
a6f3f128
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
43 addition
and
17 deletion
+43
-17
build.sh
build.sh
+1
-1
cmake/RPM.cmake
cmake/RPM.cmake
+40
-14
src/liboblog/CMakeLists.txt
src/liboblog/CMakeLists.txt
+2
-2
未找到文件。
build.sh
浏览文件 @
fe6827d0
...
...
@@ -116,7 +116,7 @@ function build
do_build
"
$@
"
-DCMAKE_BUILD_TYPE
=
Debug
;;
xrpm
)
do_build
"
$@
"
-DCMAKE_BUILD_TYPE
=
RelWithDebInfo
-DOB_USE_CCACHE
=
OFF
-DOB_COMPRESS_DEBUG_SECTIONS
=
ON
-DOB_STATIC_LINK_LGPL_DEPS
=
OFF
do_build
"
$@
"
-D
OB_BUILD_LIBOBLOG
=
ON
-D
CMAKE_BUILD_TYPE
=
RelWithDebInfo
-DOB_USE_CCACHE
=
OFF
-DOB_COMPRESS_DEBUG_SECTIONS
=
ON
-DOB_STATIC_LINK_LGPL_DEPS
=
OFF
;;
*
)
BUILD_ARGS
=(
debug
"
${
BUILD_ARGS
[@]
}
"
)
...
...
cmake/RPM.cmake
浏览文件 @
fe6827d0
...
...
@@ -50,16 +50,10 @@ install(FILES
## 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
set
(
OCEANBASE_DEVEL_LIB_FILES
${
CMAKE_BINARY_DIR
}
/src/sql/parser/libob_sql_proxy_parser_static.a
DESTINATION lib
COMPONENT devel
)
install
(
FILES
src/liboblog/src/liboblog.h
)
set
(
OCEANBASE_DEVEL_INCLUDE_FILES
deps/oblib/src/lib/ob_errno.h
deps/oblib/src/common/sql_mode/ob_sql_mode.h
src/sql/parser/ob_item_type.h
...
...
@@ -67,13 +61,42 @@ install(FILES
src/sql/parser/parse_malloc.h
src/sql/parser/parser_proxy_func.h
src/sql/parser/parse_node.h
DESTINATION include
COMPONENT devel
)
)
set
(
OCEANBASE_DEVEL_BIN_FILES
""
)
if
(
OB_BUILD_LIBOBLOG
)
# lib
list
(
APPEND OCEANBASE_DEVEL_LIB_FILES
${
CMAKE_BINARY_DIR
}
/src/liboblog/src/liboblog.so
)
list
(
APPEND OCEANBASE_DEVEL_LIB_FILES
${
CMAKE_BINARY_DIR
}
/src/liboblog/src/liboblog.so.1
)
list
(
APPEND OCEANBASE_DEVEL_LIB_FILES
${
CMAKE_BINARY_DIR
}
/src/liboblog/src/liboblog.so.1.0.0
)
# include
list
(
APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/liboblog/src/liboblog.h
)
# bin
list
(
APPEND OCEANBASE_DEVEL_BIN_FILES
${
CMAKE_BINARY_DIR
}
/src/liboblog/tests/oblog_tailf
)
endif
()
set
(
CPACK_RPM_DEVEL_DEFAULT_USER
"root"
)
set
(
CPACK_RPM_DEVEL_DEFAULT_GROUP
"root"
)
install
(
PROGRAMS
${
CMAKE_BINARY_DIR
}
/src/liboblog/tests/oblog_tailf
DESTINATION bin
COMPONENT devel
)
${
OCEANBASE_DEVEL_LIB_FILES
}
DESTINATION /usr/lib
COMPONENT devel
)
install
(
FILES
${
OCEANBASE_DEVEL_INCLUDE_FILES
}
DESTINATION /usr/include
COMPONENT devel
)
install
(
PROGRAMS
${
OCEANBASE_DEVEL_BIN_FILES
}
DESTINATION /usr/bin
COMPONENT devel
)
## oceanbase-libs
install
(
PROGRAMS
...
...
@@ -87,6 +110,9 @@ install(PROGRAMS
)
# utils
set
(
CPACK_RPM_UTILS_DEFAULT_USER
"root"
)
set
(
CPACK_RPM_UTILS_DEFAULT_GROUP
"root"
)
install
(
PROGRAMS
${
CMAKE_BINARY_DIR
}
/tools/ob_admin/ob_admin
${
CMAKE_BINARY_DIR
}
/tools/ob_error/src/ob_error
...
...
src/liboblog/CMakeLists.txt
浏览文件 @
fe6827d0
...
...
@@ -2,11 +2,11 @@ message(STATUS "OB_BUILD_LIBOBLOG ${OB_BUILD_LIBOBLOG}")
if
(
OB_BUILD_LIBOBLOG
)
find_package
(
Git QUIET
)
if
(
GIT_FOUND
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
submodule update --
init
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
submodule update --
remote
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
RESULT_VARIABLE GIT_SUBMOD_RESULT
)
if
(
NOT GIT_SUBMOD_RESULT EQUAL
"0"
)
message
(
FATAL_ERROR
"git submodule update --
init
failed with
${
GIT_SUBMOD_RESULT
}
, please checkout submodules"
)
message
(
FATAL_ERROR
"git submodule update --
remote
failed with
${
GIT_SUBMOD_RESULT
}
, please checkout submodules"
)
endif
()
add_subdirectory
(
${
PROJECT_SOURCE_DIR
}
/deps/logmessage
${
PROJECT_BINARY_DIR
}
/deps/logmessage EXCLUDE_FROM_ALL
)
add_definitions
(
-D_GLIBCXX_USE_CXX11_ABI=0
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录