[dss-commits] r8785 - in dss/trunk: . debian

[dss-commits at forum.digitalstrom.org]

Author: jwinkelmann
Date: 2009-09-22 15:44:56 +0200 (Tue, 22 Sep 2009)
New Revision: 8785

Modified:
   dss/trunk/CMakeLists.txt
   dss/trunk/README
   dss/trunk/config.h.in
   dss/trunk/debian/rules
   dss/trunk/main.cpp
Log:
get rid of RELEASE_BUILD, always include svn rev, build user and build host in compile output

Modified: dss/trunk/CMakeLists.txt
===================================================================
--- dss/trunk/CMakeLists.txt	2009-09-22 12:56:37 UTC (rev 8784)
+++ dss/trunk/CMakeLists.txt	2009-09-22 13:44:56 UTC (rev 8785)
@@ -4,7 +4,6 @@
 OPTION(WITH_TESTS "Include test-suite" ON)
 OPTION(WITH_SIM "Compile and start the simulation" ON)
 OPTION(WITH_GCOV "Compile coverage information into the dss" OFF)
-OPTION(RELEASE_BUILD "Whether this release is a release build" OFF)
 
 IF(NOT WITH_DATADIR)
   SET(WITH_DATADIR "${CMAKE_INSTALL_PREFIX}/share/dss/data" CACHE FILEPATH "Data directory")

Modified: dss/trunk/README
===================================================================
--- dss/trunk/README	2009-09-22 12:56:37 UTC (rev 8784)
+++ dss/trunk/README	2009-09-22 13:44:56 UTC (rev 8785)
@@ -34,8 +34,6 @@
 -DWITH_SIM=[yes|no] 
  include the simulation in the build
 -DCMAKE_BUILD_TYPE=[Release|Debug]
--DRELEASE_BUILD=[0|1]
- create a release build (only affects version number output)
 
 == Using ==
 

Modified: dss/trunk/config.h.in
===================================================================
--- dss/trunk/config.h.in	2009-09-22 12:56:37 UTC (rev 8784)
+++ dss/trunk/config.h.in	2009-09-22 13:44:56 UTC (rev 8785)
@@ -15,7 +15,6 @@
 #cmakedefine WITH_DATADIR "${WITH_DATADIR}"
 #cmakedefine WITH_BONJOUR
 #cmakedefine WITH_GCOV
-#cmakedefine RELEASE_BUILD
 
 #endif /* DIGITAL_STROM_SERVER_CONFIG_H */
 

Modified: dss/trunk/debian/rules
===================================================================
--- dss/trunk/debian/rules	2009-09-22 12:56:37 UTC (rev 8784)
+++ dss/trunk/debian/rules	2009-09-22 13:44:56 UTC (rev 8785)
@@ -16,7 +16,7 @@
 builddir/Makefile:
 	dh_testdir
 	mkdir -p builddir
-	cd builddir && cmake .. -DRELEASE_BUILD=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON
+	cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON
 
 
 build: build-stamp

Modified: dss/trunk/main.cpp
===================================================================
--- dss/trunk/main.cpp	2009-09-22 12:56:37 UTC (rev 8784)
+++ dss/trunk/main.cpp	2009-09-22 13:44:56 UTC (rev 8785)
@@ -63,17 +63,16 @@
 } // parse_prop
 
 void printVersion() {
+  cout << "DSS";
+#ifdef HAVE_CONFIG_H
+  cout << " v" << DSS_VERSION;
+#endif
 #ifdef HAVE_BUILD_INFO_H
-  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;
+  cout << " (r" << DSS_RCS_REVISION << ")"
+       << " (" << DSS_BUILD_USER << "@" << DSS_BUILD_HOST << ")"
+       << " " << DSS_BUILD_DATE;
 #endif
-#else
-  cout << "No build information included" << endl;
-#endif
+  cout << endl;
 }
 
 int main (int argc, char* argv[]) {
@@ -82,7 +81,7 @@
     cerr << "Can't set the specified locale! Check LANG, LC_CTYPE, LC_ALL." << endl;
     return 1;
   }
-  
+
   // make sure timezone gets set
   tzset();
 
@@ -188,7 +187,7 @@
       // more expressive; this should go away in the future
       printVersion();
 
-      
+
       dss::DSS::getInstance()->initialize(properties);
       dss::DSS::getInstance()->run();
     }