chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump version

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-09 22:02:39 -04:00
parent ec568966c8
commit b69e042f21
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions.cmake
View File

@ -1,6 +1,6 @@
# Version number components # Version number components
set (WSJTX_VERSION_MAJOR 0) set (WSJTX_VERSION_MAJOR 0)
set (WSJTX_VERSION_MINOR 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_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 set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build

8
revision_utils.cpp
View File

@ -27,6 +27,7 @@ namespace
QString revision (QString const& svn_rev_string) QString revision (QString const& svn_rev_string)
{ {
QString result; QString result;
#if 0
auto revision_from_svn = revision_extract_number (svn_rev_string); auto revision_from_svn = revision_extract_number (svn_rev_string);
#if defined (CMAKE_BUILD) #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 // not CMake build so all we have is revision passed
result = revision_from_svn; result = revision_from_svn;
} }
#endif
#endif #endif
return result.trimmed (); return result.trimmed ();
} }
QString version (bool include_patch) QString version (bool include_patch)
{ {
#if 0
#if defined (CMAKE_BUILD) #if defined (CMAKE_BUILD)
QString v {WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR)}; QString v {WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR)};
if (include_patch) if (include_patch)
{ {
v += "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) v += "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH)
#if 0
# if defined (WSJTX_RC) # if defined (WSJTX_RC)
+ "-rc" WSJTX_STRINGIZE (WSJTX_RC) + "-rc" WSJTX_STRINGIZE (WSJTX_RC)
# endif # endif
#endif
; ;
} }
#else #else
QString v {"Not for Release"}; QString v {"Not for Release"};
#endif #endif
#endif
QString v {"0.0.3"};
return v; return v;
} }