w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Turn on release candidate labeling for WSJT-X. 

Use  the WSJTX_RC  variable in  Versions.cmake to  label and  identify
program and packages.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4338 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2014-09-18 22:32:27 +00:00
parent b6a7d5d47d
commit 42fbacd86e
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -882,6 +882,9 @@ set (CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
set (CPACK_PACKAGE_VERSION_MAJOR ${WSJTX_VERSION_MAJOR})
set (CPACK_PACKAGE_VERSION_MINOR ${WSJTX_VERSION_MINOR})
set (CPACK_PACKAGE_VERSION_PATCH ${WSJTX_VERSION_PATCH})
if (WSJTX_RC)
set (CPACK_PACKAGE_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}-rc${WSJTX_RC})
endif (WSJTX_RC)
if (WIN32)
set (CPACK_GENERATOR "NSIS")

2
Versions.cmake
View File

@ -2,7 +2,7 @@
set (WSJTX_VERSION_MAJOR 1)
set (WSJTX_VERSION_MINOR 4)
set (WSJTX_VERSION_PATCH 0)
#set (WSJTX_RC 1)
set (WSJTX_RC 1)
set (WSJTX_VERSION_IS_RELEASE 0)
set (CONFIG_TEST_VERSION_MAJOR 0)

12
revision_utils.cpp
View File

@ -1,5 +1,7 @@
#include "revision_utils.hpp"
#include <cstring>
#include <QCoreApplication>
#include <QRegularExpression>
@ -73,8 +75,14 @@ QString revision (QString const& svn_rev_string)
QString program_title (QString const& revision)
{
#if defined (CMAKE_BUILD)
return QCoreApplication::applicationName () + " v" WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) " " + revision + " by K1JT";
QString id {QCoreApplication::applicationName () + " 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);
# endif
#else
return "WSJT-X v1.4 " + revision + " by K1JT";
QString id {"WSJT-X v1.4";
#endif
return id + " " + revision + " by K1JT";
}