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

fix observer bin build_version error number

Browse Source
This commit is contained in:
wenxingsen
2024-04-10 17:25:22 +00:00
committed by ob-robot
parent 0e96deaa6a
commit f3e618e443
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/DEB.cmake
View File

@ -28,6 +28,11 @@ if(DEBIAN_NAME AND DEBIAN_VERSION)
set(CPACK_DEBIAN_PACKAGE_RELEASE "${CPACK_DEBIAN_PACKAGE_RELEASE}${DEBIAN_NAME}${DEBIAN_VERSION}")
endif()
if (OB_DISABLE_LSE)
ob_insert_nonlse_to_package_version(${CPACK_DEBIAN_PACKAGE_RELEASE} CPACK_DEBIAN_PACKAGE_RELEASE)
message(STATUS "CPACK_DEBIAN_PACKAGE_RELEASE: ${CPACK_DEBIAN_PACKAGE_RELEASE}")
endif()
set(CPACK_DEBIAN_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
set(CPACK_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
set(CPACK_PACKAGE_CONTACT "${OceanBase_CE_HOMEPAGE_URL}")

5
cmake/RPM.cmake
View File

@ -17,6 +17,11 @@ set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
include(cmake/Pack.cmake)
set(CPACK_RPM_PACKAGE_RELEASE ${OB_RELEASEID})
if (OB_DISABLE_LSE)
ob_insert_nonlse_to_package_version(${CPACK_RPM_PACKAGE_RELEASE} CPACK_RPM_PACKAGE_RELEASE)
message(STATUS "CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}")
endif()
if (OB_BUILD_OPENSOURCE)
set(CPACK_RPM_PACKAGE_URL "${OceanBase_CE_HOMEPAGE_URL}")
set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)

17
cmake/Utils.cmake
View File

@ -142,3 +142,20 @@ function(ob_add_new_object_target target target_objects_list)
config_target_unity(${target})
config_ccls_flag(${target})
endfunction()
function(ob_insert_nonlse_to_package_version INPUT_PACKAGE_VERSION OUTPUT_PACKAGE_VERSION)
# 在传入的版本号中插入nonlse版本号
# input: 2024041400001.el7
# output: 2024041400001.nonlse.el7
set(${OUTPUT_PACKAGE_VERSION} "${INPUT_PACKAGE_VERSION}" PARENT_SCOPE)
string(FIND "${INPUT_PACKAGE_VERSION}" "." DOT_INDEX REVERSE)
# 只有包含.的才处理
if(DOT_INDEX GREATER -1)
# 计算插入点位置
math(EXPR INSERT_INDEX "${DOT_INDEX} + 1")
string(SUBSTRING "${INPUT_PACKAGE_VERSION}" 0 "${INSERT_INDEX}" FILE_NAME_PREFIX)
string(SUBSTRING "${INPUT_PACKAGE_VERSION}" "${INSERT_INDEX}" "-1" FILE_NAME_SUFFIX)
# 拼接最后的带有nonlse版本号
set(${OUTPUT_PACKAGE_VERSION} "${FILE_NAME_PREFIX}nonlse.${FILE_NAME_SUFFIX}" PARENT_SCOPE)
endif()
endfunction()