[dss-commits] r8755 - dss/trunk

[dss-commits at forum.digitalstrom.org]

Author: jwinkelmann
Date: 2009-09-09 13:51:58 +0200 (Wed, 09 Sep 2009)
New Revision: 8755

Modified:
   dss/trunk/config.h.in
   dss/trunk/main.cpp
Log:
move (release) version number to config.h.in

Modified: dss/trunk/config.h.in
===================================================================
--- dss/trunk/config.h.in	2009-09-09 11:10:13 UTC (rev 8754)
+++ dss/trunk/config.h.in	2009-09-09 11:51:58 UTC (rev 8755)
@@ -1,6 +1,8 @@
 #ifndef DIGITAL_STROM_SERVER_CONFIG_H
 #define DIGITAL_STROM_SERVER_CONFIG_H
 
+#define DSS_VERSION "0.5-dev"
+
 /* SpiderMonkey API header */
 #cmakedefine HAVE_MOZJS_JSAPI_H
 #cmakedefine HAVE_JS_JSAPI_H

Modified: dss/trunk/main.cpp
===================================================================
--- dss/trunk/main.cpp	2009-09-09 11:10:13 UTC (rev 8754)
+++ dss/trunk/main.cpp	2009-09-09 11:51:58 UTC (rev 8755)
@@ -51,8 +51,6 @@
 
 #include <iostream>
 
-#define DSS_VERSION "0.4a1"
-
 using namespace std;
 namespace po = boost::program_options;
 
@@ -65,16 +63,12 @@
 } // parse_prop
 
 void printVersion() {
-#ifdef RELEASE_BUILD
-  cout << "DSS v" << DSS_VERSION << " released at " << DSS_BUILD_DATE << endl;
-#else
-  cout << "DSS version info:\n";
-  cout << "  RCS revision: " << DSS_RCS_REVISION << "\n";
-  cout << "  RCS url:      " << DSS_RCS_URL << "\n";
-  cout << "  build date:   " << DSS_BUILD_DATE << "\n";
-  cout << "  build user:   " << DSS_BUILD_USER << "\n";
-  cout << "  build host:   " << DSS_BUILD_HOST << "\n";
-  cout << endl;
+  cout << "DSS v" << DSS_VERSION << " built on " << DSS_BUILD_DATE << endl;
+#ifndef RELEASE_BUILD
+  cout << "  RCS revision: " << DSS_RCS_REVISION << endl;
+  cout << "  RCS url:      " << DSS_RCS_URL      << endl;
+  cout << "  build user:   " << DSS_BUILD_USER   << endl;
+  cout << "  build host:   " << DSS_BUILD_HOST   << endl;
 #endif
 }