Commit 2179d5d5 authored by David Jarvie's avatar David Jarvie
Browse files

Use incremental version suffix to make version unique for each KDE Gear release

.1, .2, etc looks nicer than appending the KDE Gear version
parent bff01a8b
Pipeline #205517 skipped
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
set(PIM_VERSION "5.20.80")
set(PIM_VERSION ${PIM_VERSION})
set(RELEASE_SERVICE_VERSION_MAJOR "22")
set(RELEASE_SERVICE_VERSION_MINOR "07")
set(RELEASE_SERVICE_VERSION_MICRO "80")
set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
set(KALARM_VERSION "3.5.0.${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}")
set(RELEASE_SERVICE_VERSION "22.07.80")
set(KALARM_VERSION "3.5.0")
# Whenever KALARM_VERSION changes, set KALARM_RELEASE_SUB_VERSION to "".
# If KALARM_VERSION has not changed since the last KDE release service release,
# increment KALARM_RELEASE_SUB_VERSION (to "1", "2", ...) to ensure that KAlarm
# always has a different version for every KDE release.
set(KALARM_RELEASE_SUB_VERSION "")
if (NOT ${KALARM_RELEASE_SUB_VERSION} EQUAL "")
set(KALARM_VERSION "${KALARM_VERSION}.${KALARM_RELEASE_SUB_VERSION}")
endif()
project(kalarm VERSION ${KALARM_VERSION})
......
  • I think you need to keep the 4 lines

    set(RELEASE_SERVICE_VERSION_MAJOR "22")
    set(RELEASE_SERVICE_VERSION_MINOR "07")
    set(RELEASE_SERVICE_VERSION_MICRO "80")
    set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")`

    because there is a script which increments them automatically

    Edited by Luigi Toscano
  • What script is that? I just compared kalarm's CMakeLists.txt to korganizer's (as an example), and it doesn't set MAJOR, MINOR etc.

  • I don't think korganizer is a good example, I see the values are bumped manually. But generally this script is used:

    https://invent.kde.org/sysadmin/release-tools/-/blob/master/increase_repos_version.sh

  • @heikobecker @aacid can provide more details

  • I don't think korganizer is a good example, I see the values are bumped manually. But generally this script is used:

    https://invent.kde.org/sysadmin/release-tools/-/blob/master/increase_repos_version.sh

    Correct, there are project's that do it manually and yes, that's the script used in the process of creating Gear releases.

  • Thanks both. Fixed now.

Supports Markdown
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