Changeset 620

Timestamp:

Apr 23, 2008, 2:43:10 AM (14 years ago)

Author:

Peter Johansson

Message:

Made version string (in parenthesis) a function that is called from footer and function creating --version output. PP Macro TIME and DATE were moved to subversion_info.cc. For details about why see comment in subversion_info.h

Location:

trunk

Files:

• bin/Parameter.cc (modified) (1 diff)
• lib/html_utility.cc (modified) (1 diff)
• lib/subversion_info.cc.in (modified) (1 diff)
• lib/subversion_info.h (modified) (1 diff)
• lib/utility.cc (modified) (2 diffs)
• lib/utility.h (modified) (1 diff)

trunk/bin/Parameter.cc

@@ -263 +263 @@
     ColumnStream cs(std::cout, 1);
     cs.width(0)=79;
-    cs << PACKAGE_STRING;
-    cs << " (";
-    if (DEV_BUILD)
-      cs << "r" << svn_revision() << " ";
-    cs << "compiled " << __DATE__ ", " << __TIME__ << ")\n";
-    
+    cs << PACKAGE_STRING << version_string() << "\n";
     cs << "\nCopyright (C) " << svn_year() 
        << " Jari H\u00E4kkinen and Peter Johansson.\n"

trunk/lib/html_utility.cc

@@ -68 +68 @@
        << anchor("http://trac.thep.lu.se/svndigest/", 
                  PACKAGE_STRING, 0, "");
-    if (DEV_BUILD)
-      os << " (r" << svn_revision() << ")";
+    os << version_string() << "\n";
     os << "\n</p>\n</div>\n</body>\n</html>\n";
   }

trunk/lib/subversion_info.cc.in

@@ -28 +28 @@
 namespace svndigest{
 
+  std::string compilation_date(void)
+  {
+    return __DATE__;
+  }
+
+
+  std::string compilation_time(void)
+  {
+    return __TIME__;
+  }
+
+
   std::string svn_revision(void)
   {

trunk/lib/subversion_info.h

@@ -30 +30 @@
 namespace svndigest{
 
+  // This functions are (mis)placed here to reflect compilation time
+  // of subversion_info.cc. Previously, __TIME__ macro was placed in
+  // `bin/Parameter.cc' and since the Parameter is almost independent
+  // of other parts of the package, that compilation time does not
+  // very accurately reflect the building time of the svndigest
+  // binary. subversion_info.cc is at least modified when updating
+  // against repository and therefore these functions will return a
+  // time no earlier than last `svn update'
+  std::string compilation_date(void);
+  std::string compilation_time(void);
+
   std::string svn_revision(void);
 

trunk/lib/utility.cc

@@ -23 +23 @@
 
 #include "utility.h"
+
+#include "subversion_info.h"
+#include "config.h"
 
 #include <cassert>
@@ -321 +324 @@
 
 
+  std::string version_string(void)
+  {
+    std::stringstream ss;
+    ss << " (";
+    if (DEV_BUILD)
+      ss << "r" << svn_revision() << " ";
+    ss << "compiled " << compilation_time() << ", " << compilation_date() 
+       << ")";
+    return ss.str();
+  }
+
+
   std::string match(std::string::const_iterator& first,
                     const std::string::const_iterator& last,

trunk/lib/utility.h

@@ -200 +200 @@
   inline std::string trim(std::string str) { return htrim(ltrim(str)); }
 
+  ///
+  /// \return string with version info
+  ///
+  std::string version_string(void);
+  
 
   template <typename T>