From b69e042f21d82e79badff52fda590b3a22459e8d Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Mon, 9 Jul 2018 22:02:39 -0400 Subject: [PATCH] Bump version --- Versions.cmake | 2 +- revision_utils.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Versions.cmake b/Versions.cmake index 40644e2..c953581 100644 --- a/Versions.cmake +++ b/Versions.cmake @@ -1,6 +1,6 @@ # Version number components set (WSJTX_VERSION_MAJOR 0) set (WSJTX_VERSION_MINOR 0) -set (WSJTX_VERSION_PATCH 3) +set (WSJTX_VERSION_PATCH 4) set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build diff --git a/revision_utils.cpp b/revision_utils.cpp index d25b0cb..4162546 100644 --- a/revision_utils.cpp +++ b/revision_utils.cpp @@ -27,6 +27,7 @@ namespace QString revision (QString const& svn_rev_string) { QString result; +#if 0 auto revision_from_svn = revision_extract_number (svn_rev_string); #if defined (CMAKE_BUILD) @@ -59,29 +60,28 @@ QString revision (QString const& svn_rev_string) // not CMake build so all we have is revision passed result = revision_from_svn; } +#endif #endif return result.trimmed (); } QString version (bool include_patch) { -#if 0 #if defined (CMAKE_BUILD) QString v {WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR)}; if (include_patch) { v += "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) +#if 0 # if defined (WSJTX_RC) + "-rc" WSJTX_STRINGIZE (WSJTX_RC) # endif +#endif ; } #else QString v {"Not for Release"}; #endif -#endif - - QString v {"0.0.3"}; return v; }