w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-30 04:32:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Further changes to the way verion and revision numbers are generated

Browse Source 
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
This commit is contained in:
Bill Somerville 2015-02-21 23:25:14 +00:00
parent f259ee2959
commit 2c65e3ea30
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/getsvn.cmake
View File

@ -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")

9
main.cpp
View File

@ -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};

21
revision_utils.cpp
View File

@ -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";
}

1
revision_utils.hpp
View File

@ -4,6 +4,7 @@
#include <QString>
QString revision (QString const& svn_rev_string = QString {});
QString version ();
QString program_title (QString const& revision = QString {});
#endif