[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Andi Fischer]

SVN commit 1240533 by fischer:

SVN revision number added to the version string.

 M  +14 -0     CMakeLists.txt  
 A             cmake (directory)  
 A             cmake/revision.h.in  
 M  +0 -1      umldoc.cpp  
 M  +6 -4      version.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #1240532:1240533
@@ -3,6 +3,20 @@
 
 add_definitions(-DQT3_SUPPORT_WARNINGS)
 
+# Get subversion revision number
+find_package(Subversion)
+if(Subversion_FOUND)
+    # extract working copy information for SOURCE_DIR into MY_XXX variables
+    Subversion_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} MY)
+    set(SUBVERSION_REVISION ${MY_WC_REVISION})
+    MESSAGE(STATUS "\n-- SVN Revision: ${MY_WC_REVISION}\n")
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/revision.h.in ${CMAKE_CURRENT_BINARY_DIR}/revision.temp)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                    ${CMAKE_CURRENT_BINARY_DIR}/revision.temp ${CMAKE_CURRENT_BINARY_DIR}/revision.h
+                    COMMAND touch ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
+    file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/revision.temp)
+endif(Subversion_FOUND)
+
 # Some definitions for experimental code or debugging
 #add_definitions(-DWANT_LVTOOLTIP)                # umllistiew
 #add_definitions(-DXMI_FLAT_PACKAGES)             # umlobject
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #1240532:1240533
@@ -48,7 +48,6 @@
 #include "widget_utils.h"
 
 // kde includes
-#include <kdeversion.h>
 #include <kio/job.h>
 #include <kio/netaccess.h>
 #include <klocale.h>
--- trunk/KDE/kdesdk/umbrello/umbrello/version.h #1240532:1240533
@@ -1,25 +1,27 @@
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2008                                               *
+ *   copyright (C) 2002-2011                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
 #ifndef UMBRELLO_VERSION_H
 #define UMBRELLO_VERSION_H
 
+#include "revision.h"
+
 #include <kdeversion.h>
 
 inline QByteArray umbrelloVersion()
 {
-    return QString("%1.%2.%3")
+    return QString("%1.%2.%3-r%4")
         .arg(KDE::versionMajor()-2)
         .arg(KDE::versionMinor())
-        .arg(KDE::versionRelease()).toLatin1();
+        .arg(KDE::versionRelease())
+        .arg(REVISION).toLatin1();
 }
 
 #endif