Commit 58bb7135 authored by Antenore Gatta's avatar Antenore Gatta

Preparing for official release v1.2.30

parent a4a55b90
This diff is collapsed.
......@@ -98,12 +98,8 @@ endif()
set(WITH_LIBRARY_VERSIONING "ON")
set(REMMINA_VERSION_MAJOR "1")
set(REMMINA_VERSION_MINOR "2")
set(REMMINA_VERSION_REVISION "0")
set(REMMINA_VERSION_SUFFIX "rcgit-29")
set(REMMINA_VERSION_REVISION "30")
set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}")
if(NOT ${REMMINA_VERSION_SUFFIX} STREQUAL "")
set(REMMINA_VERSION "${REMMINA_VERSION}-${REMMINA_VERSION_SUFFIX}")
endif()
include(GetGitRevisionDescription)
git_get_exact_tag(REMMINA_GIT_REVISION --tags --always)
......@@ -111,9 +107,6 @@ if(${REMMINA_GIT_REVISION} STREQUAL "n/a")
git_rev_parse(REMMINA_GIT_REVISION --short)
endif()
if(NOT REMMINA_GIT_REVISION OR ${REMMINA_GIT_REVISION} STREQUAL "n/a")
set(REMMINA_GIT_REVISION ${REMMINA_VERSION_SUFFIX})
endif()
message(STATUS "Git Revision ${REMMINA_GIT_REVISION}")
if(NOT UNIQUE_APPNAME)
......
......@@ -32,8 +32,7 @@
set(SNAP_NAME "remmina")
set(SNAP_VERSION ${REMMINA_VERSION})
if(NOT ${GIT_REVISION} STREQUAL ${REMMINA_VERSION_SUFFIX} AND
NOT ${GIT_REVISION} MATCHES "^v?[0-9].[0-9].[0-9](-rcgit.[0-9]*)?$")
if(NOT ${GIT_REVISION} MATCHES "^v?[0-9].[0-9].[0-9][0-9]?$")
set(SNAP_VERSION ${SNAP_VERSION}+git${GIT_REVISION})
endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment