hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch pr_126 into master

Browse Source 
Title: Github merge request from the pull request #126

code review from github
This commit is contained in:
wangzelin.wzl 2021-06-30 14:32:55 +08:00 committed by wangzelin.wzl
commit 673919f01e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/RPM.cmake
View File

@ -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)

2
src/share/ob_version.cpp.in
View File

@ -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@"; }