Skip to content

Commit

Permalink
MCOL-5521: Use Columnstore VERSION file for CMAPI versioning.
Browse files Browse the repository at this point in the history
[fix] columnstore_version.cmake setting extra variables for CMAPI versioning
[fix] CMAPI CmakeLists.txt using columnstore_version.cmake file
[fix] CMAPI VERSION file to template file due to using it inside CMAPI applicatio
n
  • Loading branch information
mariadb-AlanMologorsky authored and tntnatbry committed Jun 30, 2023
1 parent 5258ab0 commit 74647cd
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
6 changes: 5 additions & 1 deletion cmake/columnstore_version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ MACRO(GET_COLUMNSTORE_VERSION)
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_PATCH" CS_PATCH_VERSION)
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_EXTRA" CS_EXTRA_VERSION)
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_RELEASE" CS_RELEASE_VERSION)

IF(CMAPI)
SET(CMAPI_VERSION_MAJOR ${CS_MAJOR_VERSION})
SET(CMAPI_VERSION_MINOR ${CS_MINOR_VERSION})
SET(CMAPI_VERSION_PATCH ${CS_PATCH_VERSION}${CS_EXTRA_VERSION})
ENDIF()

IF(NOT "${CS_MAJOR_VERSION}" MATCHES "[0-9]+" OR
NOT "${CS_MINOR_VERSION}" MATCHES "[0-9]+" OR
Expand Down
14 changes: 8 additions & 6 deletions cmapi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ PROJECT(cmapi NONE)

SET(CPACK_PACKAGE_NAME "MariaDB-columnstore-cmapi")

FILE(STRINGS VERSION CRUDE_CMAPI_VERSION_MAJOR REGEX "^CMAPI_VERSION_MAJOR=")
FILE(STRINGS VERSION CRUDE_CMAPI_VERSION_MINOR REGEX "^CMAPI_VERSION_MINOR=")
FILE(STRINGS VERSION CRUDE_CMAPI_VERSION_PATCH REGEX "^CMAPI_VERSION_PATCH=")
STRING(REPLACE "CMAPI_VERSION_MAJOR=" "" CMAPI_VERSION_MAJOR ${CRUDE_CMAPI_VERSION_MAJOR})
STRING(REPLACE "CMAPI_VERSION_MINOR=" "" CMAPI_VERSION_MINOR ${CRUDE_CMAPI_VERSION_MINOR})
STRING(REPLACE "CMAPI_VERSION_PATCH=" "" CMAPI_VERSION_PATCH ${CRUDE_CMAPI_VERSION_PATCH})

# use columnstore package versioning
SET(CMAPI "YES")
SET(ENGINE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake)
INCLUDE(columnstore_version)
SET(PACKAGE_VERSION "${CMAPI_VERSION_MAJOR}.${CMAPI_VERSION_MINOR}.${CMAPI_VERSION_PATCH}")

SET(CMAPI_USER "root")

SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB ColumnStore CMAPI: cluster management API and command line tool.")
Expand All @@ -29,6 +30,7 @@ SET(CMAPI_CONF_FILEPATH "${ETC_DIR}/cmapi_server.conf")

STRING(TOLOWER ${CPACK_PACKAGE_NAME} SYSTEMD_UNIT_NAME)

CONFIGURE_FILE(VERSION.template VERSION)
CONFIGURE_FILE(service.template ${SYSTEMD_UNIT_NAME}.service)
CONFIGURE_FILE(systemd.env.template systemd.env)
CONFIGURE_FILE(postinst.template postinst)
Expand Down
3 changes: 0 additions & 3 deletions cmapi/VERSION

This file was deleted.

3 changes: 3 additions & 0 deletions cmapi/VERSION.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CMAPI_VERSION_MAJOR=${CMAPI_VERSION_MAJOR}
CMAPI_VERSION_MINOR=${CMAPI_VERSION_MINOR}
CMAPI_VERSION_PATCH=${CMAPI_VERSION_PATCH}

0 comments on commit 74647cd

Please sign in to comment.