w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-16 20:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Abandon getting changeset revision number from svn keyword expansion

Browse Source 
Subversion keyword expansion of $Rev:$ in  a file is hopeless as it is
impossible to  coordinate with  a release. Revert  to an  empty string
when it can't be discovered with svn info etc..

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.4@4983 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-02-21 22:28:08 +00:00
parent 4df7eeeb65
commit f259ee2959
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.cpp
View File

@ -48,12 +48,13 @@ int main(int argc, char *argv[])
// Override programs executable basename as application name. // Override programs executable basename as application name.
a.setApplicationName ("WSJT-X"); a.setApplicationName ("WSJT-X");
#if CMAKE_BUILD #if CMAKE_BUILD
a.setApplicationVersion (WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) QString version {WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR)
"." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR)
"." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) " " + revision ()); "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) " " + revision ()};
#else #else
a.setApplicationVersion ("1.4.0"); QString version {"1.4.0"};
#endif #endif
a.setApplicationVersion (version.trimmed ());
bool multiple {false}; bool multiple {false};

4
mainwindow.cpp
View File

@ -74,7 +74,7 @@ private:
MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdmem, QString const& thekey, MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdmem, QString const& thekey,
unsigned downSampleFactor, bool test_mode, QWidget *parent) : unsigned downSampleFactor, bool test_mode, QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
m_revision {revision ("$Rev$")}, m_revision {revision ()},
m_multiple {multiple}, m_multiple {multiple},
m_settings (settings), m_settings (settings),
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
@ -3019,7 +3019,7 @@ void MainWindow::pskSetLocal ()
psk_Reporter->setLocalStation( psk_Reporter->setLocalStation(
m_config.my_callsign () m_config.my_callsign ()
, m_config.my_grid () , m_config.my_grid ()
, antenna_description, "WSJT-X " + m_revision); , antenna_description, program_title (m_revision));
} }
void MainWindow::transmitDisplay (bool transmitting) void MainWindow::transmitDisplay (bool transmitting)

13
revision_utils.cpp
View File

@ -40,12 +40,7 @@ QString revision (QString const& svn_rev_string)
} }
else if (!revision_from_svn.isEmpty ()) else if (!revision_from_svn.isEmpty ())
{ {
// fall back to revision in ths file, this is potentially // fall back to revision passed in if any
// wrong because svn only updates the id when this file is
// touched
//
// this case gets us a revision when someone builds from a
// source snapshot or copy
result = revision_from_svn; result = revision_from_svn;
} }
else else
@ -61,14 +56,10 @@ QString revision (QString const& svn_rev_string)
#else #else
if (!revision_from_svn.isEmpty ()) if (!revision_from_svn.isEmpty ())
{ {
// not CMake build so all we have is svn revision in this file // not CMake build so all we have is revision passed
result = revision_from_svn; result = revision_from_svn;
} }
#endif #endif
if (result.isEmpty ())
{
result = "local"; // last resort fall back
}
return result.trimmed (); return result.trimmed ();
} }