]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Enable automatic update of version number
authorRagnar Thomsen <rthomsen6@gmail.com>
Wed, 29 Jul 2015 20:54:54 +0000 (22:54 +0200)
committerRagnar Thomsen <rthomsen6@gmail.com>
Wed, 29 Jul 2015 20:54:54 +0000 (22:54 +0200)
Use CMake variables autoupdated by release script. Dolphin version is
automatically updated to KDE Applications version.

CMakeLists.txt
src/main.cpp

index 3575db5da2499ce734d4a8c63b9787f63de71681..6dc60a5d8f09975f9c5acfcc190b03fb0463f187 100644 (file)
@@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(Dolphin)
 
-set(DOLPHIN_VERSION "14.12.95")
+# 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 (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 
 set(QT_MIN_VERSION "5.4.0")
 set(KF5_MIN_VERSION "5.7.0")
@@ -21,13 +25,17 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings)
 
-ecm_setup_version(${DOLPHIN_VERSION} VARIABLE_PREFIX DOLPHINVCS
+ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN
+                  VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
+)
+
+ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINVCS
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h"
                   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake"
                   SOVERSION 5
 )
 
-ecm_setup_version(${DOLPHIN_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
+ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
                   SOVERSION 5
 )
 
index ec6833681bfac2084629ed496cfd59001141217e..b4ca2c6af74273a22d555e6bd02cc75d17387348 100644 (file)
@@ -19,6 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
+#include "dolphin_version.h"
 #include "dolphinmainwindow.h"
 #include "dolphin_generalsettings.h"
 #include "dbusinterface.h"
@@ -44,7 +45,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
     migrate.migrate();
 
-    KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95",
+    KAboutData aboutData("dolphin", i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
                          i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));