From a98bf1eac34d4ec7625df6988ccdb37378d09016 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Tue, 5 Apr 2022 07:14:03 -0400 Subject: [PATCH] Remove "latest" tag from release name * Also ensure the current tag contains a proper version string. --- CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 382bcb7e..846d7c0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,7 +119,8 @@ execute_process(COMMAND git tag --points-at HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_TAG ERROR_QUIET) -if(GIT_TAG) +string(REGEX REPLACE "latest" "" GIT_TAG "${GIT_TAG}") +if(GIT_TAG MATCHES "[0-9]+\.[0-9]+\.[0-9]+") string(STRIP "${GIT_TAG}" GIT_TAG) set(OVERRIDE_VERSION ${GIT_TAG}) elseif(EXISTS ${CMAKE_SOURCE_DIR}/.version) @@ -128,14 +129,14 @@ endif() string(REGEX REPLACE "(\r?\n)+" "" OVERRIDE_VERSION "${OVERRIDE_VERSION}") if(OVERRIDE_VERSION) - if(OVERRIDE_VERSION MATCHES "^[\\.0-9]+-(alpha|beta)[0-9]+$") - set(KEEPASSXC_BUILD_TYPE PreRelease) + if(OVERRIDE_VERSION MATCHES "^[\\.0-9]+-beta[0-9]*") + set(KEEPASSXC_BUILD_TYPE "PreRelease") set(KEEPASSXC_VERSION ${OVERRIDE_VERSION}) elseif(OVERRIDE_VERSION MATCHES "^[\\.0-9]+$") - set(KEEPASSXC_BUILD_TYPE Release) + set(KEEPASSXC_BUILD_TYPE "Release") set(KEEPASSXC_VERSION ${OVERRIDE_VERSION}) else() - set(KEEPASSXC_BUILD_TYPE Snapshot) + set(KEEPASSXC_BUILD_TYPE "Snapshot") set(KEEPASSXC_VERSION ${OVERRIDE_VERSION}) endif() else()