Changeset 724 for trunk/lib/OptionVersion.cc

Timestamp:

Dec 9, 2008, 2:34:16 PM (14 years ago)

Author:

Peter Johansson

Message:

• README.developer: adding text on Requirements for building from svn checkout
• configure.ac: support for help2man and new man/Makefile
• lib/OptionVersion.cc lib/OptionVersion.h bin/Parameter.cc: changed --version output so when used in combination with --no-verbose it is compliant with help2man
• lib/utility.cc: removed function version_string not used anymore

closes #361

File:

• trunk/lib/OptionVersion.cc (modified) (2 diffs)

trunk/lib/OptionVersion.cc

@@ -35 +35 @@
 
   OptionVersion::OptionVersion(CommandLine& cmd, std::string flag, 
-                               std::string desc)
-    : OptionSwitch(cmd, flag, desc, false)
+                               std::string desc, OptionSwitch* const verbose)
+    : OptionSwitch(cmd, flag, desc, false), verbose_(verbose)
   {
   }
@@ -46 +46 @@
     ColumnStream cs(std::cout, 1);
     cs.width(0)=79;
-    cs << PACKAGE_NAME << " " << PACKAGE_VERSION << version_string() << "\n";
-    cs << "\nCopyright (C) " << svn_year() 
+    cs << PACKAGE_NAME << " " << PACKAGE_VERSION;
+    bool no_verbose = verbose_ && verbose_->present() && !verbose_->value();
+    if (!no_verbose) {
+      cs << " (";
+      if (DEV_BUILD)
+        cs << "r" << svn_revision() << " ";
+      cs << "compiled " << compilation_time() << ", " << compilation_date() 
+         << ")";
+    } 
+    cs << "\n\nCopyright (C) " << svn_year() 
        << " Jari H\u00E4kkinen and Peter Johansson.\n"
        << "This is free software. You may redistribute copies of it under "