summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <[email protected]>2015-07-21 18:01:32 +0200
committerRalf Habacker <[email protected]>2015-07-21 18:01:32 +0200
commit346bbff27f04ad444f06c396c6ea34714b95062a (patch)
treeda4f8f7a13ef2bc198bb48c09b2b5903f4f795d7
parenta360dbb6381f69179aa8f911c8a8016e0f10f614 (diff)
Use appplications micro version from KDE release script.v15.07.80
See https://community.kde.org/Applications/Versioning for more informations.
-rw-r--r--CMakeLists.txt14
-rwxr-xr-xmaintainer/update-version27
2 files changed, 9 insertions, 32 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba72e36..f4a2ac5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,13 @@
project(umbrello)
+# KDE Application Version, managed by release script
+set (KDE_APPLICATIONS_VERSION_MAJOR "15")
+set (KDE_APPLICATIONS_VERSION_MINOR "07")
+set (KDE_APPLICATIONS_VERSION_MICRO "80")
-set(VERSION_MAJOR "2")
-set(VERSION_MINOR "16")
-set(VERSION_PATCH "80")
+set(UMBRELLO_VERSION_MAJOR "2")
+set(UMBRELLO_VERSION_MINOR "16")
+set(UMBRELLO_VERSION_PATCH ${KDE_APPLICATIONS_VERSION_MICRO})
option(BUILD_KF5 "Build for KDE Frameworks 5" OFF)
@@ -164,7 +168,7 @@ add_definitions(
# set default umbrello version
# umbrello version could be overridden by cmake command line using -DUMBRELLO_VERSION_STRING=major.minor.patch
if(NOT UMBRELLO_VERSION_STRING)
- set(UMBRELLO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+ set(UMBRELLO_VERSION_STRING "${UMBRELLO_VERSION_MAJOR}.${UMBRELLO_VERSION_MINOR}.${UMBRELLO_VERSION_PATCH}")
if(EXISTS ${CMAKE_SOURCE_DIR}/.git)
execute_process(
COMMAND git rev-parse --short HEAD
@@ -201,7 +205,7 @@ include_directories(
)
# enable experimental features only in master branch
-if (VERSION_PATCH GREATER 95)
+if (UMBRELLO_VERSION_PATCH GREATER 95)
add_definitions(-DENABLE_BIRDVIEW)
add_definitions(-DENABLE_WIDGET_SHOW_DOC) # show documentation in classes ticket xxx
endif()
diff --git a/maintainer/update-version b/maintainer/update-version
deleted file mode 100755
index 61833e2..0000000
--- a/maintainer/update-version
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Update patch level in CMakelists.txt for non master branch and commit the new version.
-#
-# requirements:
-# - current branch is named 'Applications/...'
-#
-#
-version_major=$(grep set\(VERSION_MAJOR CMakeLists.txt | sed 's,^.* ",,g;s,".*$,,g')
-version_minor=$(grep set\(VERSION_MINOR CMakeLists.txt | sed 's,^.* ",,g;s,".*$,,g')
-version_patch=$(grep set\(VERSION_PATCH CMakeLists.txt | sed 's,^.* ",,g;s,".*$,,g')
-if test $version_patch -eq 99; then
- echo could not update master branch
- exit 1
-fi
-
-kde_branch=$(git branch | grep '* Applications' | sed 's,^.*/,,g')
-if test -z "$kde_branch"; then
- echo could not find Applications branch
- exit 1
-fi
-old_version_patch=$version_patch
-version_patch=$(expr $version_patch '+' 1)
-perl -pi -e "s,VERSION_PATCH \"$old_version_patch\",VERSION_PATCH \"$version_patch\",g" CMakeLists.txt
-git commit -m "Update version to $version_major.$version_minor.$version_patch (KDE Applications version $kde_branch.$version_patch)." CMakeLists.txt
-