From 2c65e3ea308e6ead2a5b225ce9be32b648a47955 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Sat, 21 Feb 2015 23:25:14 +0000
Subject: [PATCH] Further changes to the way verion and revision numbers are
 generated

Local builds from  source tar balls or the  two phase wsjtx-superbuild
no longer specify  any revision, just the version  number. Since these
sort  of builds  are  expected  to be  release  candidates or  release
versions the revision (svn changeset  number) is implicit from the svn
tag of the version.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.4@4984 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 CMake/getsvn.cmake |  2 +-
 main.cpp           |  9 +--------
 revision_utils.cpp | 21 +++++++++++++++------
 revision_utils.hpp |  1 +
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/CMake/getsvn.cmake b/CMake/getsvn.cmake
index bf7e73f73..754963639 100644
--- a/CMake/getsvn.cmake
+++ b/CMake/getsvn.cmake
@@ -45,7 +45,7 @@ else (Subversion_FOUND AND EXISTS "${SOURCE_DIR}/.svn")
     # write a file with the SVNVERSION define
     file (WRITE "${OUTPUT_DIR}/svnversion.h.txt" "#define SVNVERSION r${MY_WC_LAST_CHANGED_REV}\n")
   else (Subversion_FOUND AND EXISTS "${SOURCE_DIR}/.svn")
-    file (WRITE "${OUTPUT_DIR}/svnversion.h.txt" "#define SVNVERSION local\n")
+    file (WRITE "${OUTPUT_DIR}/svnversion.h.txt" "#define SVNVERSION\n")
   endif (Subversion_FOUND AND EXISTS "${SOURCE_DIR}/.git")
 endif (Subversion_FOUND AND EXISTS "${SOURCE_DIR}/.svn")
 
diff --git a/main.cpp b/main.cpp
index 19fa83665..130a7bfaf 100644
--- a/main.cpp
+++ b/main.cpp
@@ -47,14 +47,7 @@ int main(int argc, char *argv[])
 	      
       // Override programs executable basename as application name.
       a.setApplicationName ("WSJT-X");
-#if CMAKE_BUILD
-      QString version {WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR)
-        "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR)
-          "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) " " + revision ()};
-#else
-      QString version {"1.4.0"};
-#endif
-      a.setApplicationVersion (version.trimmed ());
+      a.setApplicationVersion (version ());
 
       bool multiple {false};
 
diff --git a/revision_utils.cpp b/revision_utils.cpp
index 11454ab94..49a2d5356 100644
--- a/revision_utils.cpp
+++ b/revision_utils.cpp
@@ -63,17 +63,26 @@ QString revision (QString const& svn_rev_string)
   return result.trimmed ();
 }
 
-QString program_title (QString const& revision)
+QString version ()
 {
 #if defined (CMAKE_BUILD)
-  QString id {QCoreApplication::applicationName () + "   v" WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH)};
-
+  QString v {WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH)};
 # if defined (WSJTX_RC)
-  id += "-rc" WSJTX_STRINGIZE (WSJTX_RC);
+  v += "-rc" WSJTX_STRINGIZE (WSJTX_RC);
 # endif
-
 #else
-  QString id {"WSJT-X   v1.4";
+  QString v {"1.4.0"};
+#endif
+  return v;
+}
+
+QString program_title (QString const& revision)
+{
+  QString id {QCoreApplication::applicationName ()};
+#if defined (CMAKE_BUILD)
+  id += "   v" + version ();
+#else
+  id += "   v1.4";
 #endif
   return id + " " + revision + "  by K1JT";
 }
diff --git a/revision_utils.hpp b/revision_utils.hpp
index 8da0c9586..838c36e25 100644
--- a/revision_utils.hpp
+++ b/revision_utils.hpp
@@ -4,6 +4,7 @@
 #include <QString>
 
 QString revision (QString const& svn_rev_string = QString {});
+QString version ();
 QString program_title (QString const& revision = QString {});
 
 #endif