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

[Andi Fischer]

SVN commit 1240853 by fischer:

SVN revision number added to version number - check for svn file added.

 M  +12 -2     CMakeLists.txt  
 M  +7 -3      version.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #1240852:1240853
@@ -5,16 +5,26 @@
 
 #### get subversion revision number ###
 
+MESSAGE(STATUS "\n")
+UNSET(SVN_FILE CACHE)
+find_file(SVN_FILE .svn ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
+if(SVN_FILE)
+    MESSAGE(STATUS "SVN used: ${SVN_FILE}.")
 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")
+        MESSAGE(STATUS "SVN Revision: ${MY_WC_REVISION}")
 else(Subversion_FOUND)
     set(SUBVERSION_REVISION 0)
-    MESSAGE(STATUS"\n-- SVN Revision: 0 - no package Subversion available!\n")
+        MESSAGE(STATUS "SVN Revision: 0 - no package Subversion available!")
 endif(Subversion_FOUND)
+else(SVN_FILE)
+    MESSAGE(STATUS "SVN not used.")
+    set(SUBVERSION_REVISION 0)
+    MESSAGE(STATUS "SVN Revision: 0 - not yet implemented!")
+endif(SVN_FILE)
 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
--- trunk/KDE/kdesdk/umbrello/umbrello/version.h #1240852:1240853
@@ -17,11 +17,15 @@
 
 inline QByteArray umbrelloVersion()
 {
-    return QString("%1.%2.%3-r%4")
+    QString versionStr = QString("%1.%2.%3")
         .arg(KDE::versionMajor()-2)
         .arg(KDE::versionMinor())
-        .arg(KDE::versionRelease())
-        .arg(REVISION).toLatin1();
+        .arg(KDE::versionRelease());
+    QString revisionStr = QString("-r%1").arg(REVISION);
+    if (revisionStr != "-r0") {
+        versionStr.append(revisionStr);
 }
+    return versionStr.toLatin1();
+}
 
 #endif