[dss-commits] r8802 - dss/trunk

[dss-commits at forum.digitalstrom.org]

Author: jwinkelmann
Date: 2009-09-28 13:19:35 +0200 (Mon, 28 Sep 2009)
New Revision: 8802

Modified:
   dss/trunk/main.cpp
Log:
main.cpp: move version string to dss

Modified: dss/trunk/main.cpp
===================================================================
--- dss/trunk/main.cpp	2009-09-28 11:16:35 UTC (rev 8801)
+++ dss/trunk/main.cpp	2009-09-28 11:19:35 UTC (rev 8802)
@@ -26,10 +26,6 @@
   #include "config.h"
 #endif
 
-#ifdef HAVE_BUILD_INFO_H
-  #include "build_info.h"
-#endif
-
 #include "core/base.h"
 #include "core/dss.h"
 #include "core/logger.h"
@@ -62,19 +58,6 @@
     }
 } // parse_prop
 
-void printVersion() {
-  cout << "DSS";
-#ifdef HAVE_CONFIG_H
-  cout << " v" << DSS_VERSION;
-#endif
-#ifdef HAVE_BUILD_INFO_H
-  cout << " (r" << DSS_RCS_REVISION << ")"
-       << " (" << DSS_BUILD_USER << "@" << DSS_BUILD_HOST << ")"
-       << " " << DSS_BUILD_DATE;
-#endif
-  cout << endl;
-}
-
 int main (int argc, char* argv[]) {
 
   if (!setlocale(LC_CTYPE, "")) {
@@ -136,7 +119,7 @@
   }
 
   if (vm.count("version")) {
-    printVersion();
+    std::cout << dss::DSS::versionString() << std::endl;
     return 1;
   }
 
@@ -182,12 +165,6 @@
   } else {
     if(!quitAfterTests) {
       // start DSS
-
-      // for now, we always print out the version to make the logs
-      // more expressive; this should go away in the future
-      printVersion();
-
-
       dss::DSS::getInstance()->initialize(properties);
       dss::DSS::getInstance()->run();
     }