[Opalvoip-svn] SF.net SVN: opalvoip:[34627] opal/trunk

[<rjo...@us...>]

Revision: 34627
          http://sourceforge.net/p/opalvoip/code/34627
Author:   rjongbloed
Date:     2016-02-16 10:07:32 +0000 (Tue, 16 Feb 2016)
Log Message:
-----------
Use newly exposed version info handling form PTLib to include SVN/GIT in standardised manner in OPAL.

Modified Paths:
--------------
    opal/trunk/revision.h.in
    opal/trunk/src/opal/manager.cxx

Modified: opal/trunk/revision.h.in
===================================================================
--- opal/trunk/revision.h.in	2016-02-16 10:06:31 UTC (rev 34626)
+++ opal/trunk/revision.h.in	2016-02-16 10:07:32 UTC (rev 34627)
@@ -29,6 +29,7 @@
 #define _OPAL_REVISION_H
 
 #define SVN_REVISION $WCREV$
+#define GIT_COMMIT ""
 
 #endif  // _OPAL_REVISION_H
 

Modified: opal/trunk/src/opal/manager.cxx
===================================================================
--- opal/trunk/src/opal/manager.cxx	2016-02-16 10:06:31 UTC (rev 34626)
+++ opal/trunk/src/opal/manager.cxx	2016-02-16 10:07:32 UTC (rev 34627)
@@ -155,11 +155,8 @@
 
 PString OpalGetVersion()
 {
-#define AlphaCode   "alpha"
-#define BetaCode    "beta"
-#define ReleaseCode "."
-
-  return psprintf("%u.%u%s%u (svn:%u)", MAJOR_VERSION, MINOR_VERSION, BUILD_TYPE, BUILD_NUMBER, SVN_REVISION);
+  PProcess::VersionInfo ver = { MAJOR_VERSION, MINOR_VERSION, PProcess::BUILD_TYPE, BUILD_NUMBER, SVN_REVISION, GIT_COMMIT };
+  return ver.AsString();
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.