提交 673919f0 编写于 作者: W wangzelin.wzl 提交者: wangzelin.wzl

Merge branch pr_126 into master

Title: Github merge request from the pull request #126

code review from github
......@@ -6,7 +6,7 @@ set(CPACK_RPM_COMPONENT_INSTALL ON)
set(CPACK_RPM_MAIN_COMPONENT "server")
# let rpmbuild determine rpm filename
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
set(CPACK_PACKAGE_RELEASE ${OB_RELEASEID})
set(CPACK_RPM_PACKAGE_RELEASE ${OB_RELEASEID})
set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
# RPM package informations.
set(CPACK_PACKAGING_INSTALL_PREFIX /home/admin/oceanbase)
......
......@@ -33,7 +33,7 @@ void get_package_and_svn(char *server_version, int64_t buf_len)
extern "C" {
#endif
const char* build_version() { return "@AONE_BUILD_NUMBER@-@GIT_REVISION@"; }
const char* build_version() { return "@OB_RELEASEID@-@GIT_REVISION@"; }
const char* build_time() { return __TIME__; }
const char* build_date() { return __DATE__; }
const char* build_flags() { return "@BUILD_FLAGS@"; }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册