commit b47d53842a6ea8d32800459270a667952d4079bf
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon May 05 14:35:03 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue May 06 18:42:04 2014 -0700
tree f57e37941fea51de2a9c183c2df609ae982a683c
parent 262f53159eca34fd6281ed4a6a566ad6ce5b9541

build+core: Add printing of version number in daemons and tools

This commit also changes how version number is handled.  Version is now
fully controlled from top-level wscript.  In addition to that, a new
NFD_VERSION_BUILD_STRING macro is set to include more detailed
information, including commit ID (e.g., "0.1.0-rc1-1-g5c86570").

Change-Id: I448eb627e0c42dc814de1107cf7bb0dc94fa2a89
Refs: #1575

daemon/main.cpp

diff --git a/daemon/main.cpp b/daemon/main.cpp
index d647936..ebea105 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -25,6 +25,7 @@
 #include <getopt.h>
 #include <boost/filesystem.hpp>
 
+#include "version.hpp"
 #include "core/logger.hpp"
 #include "core/global-io.hpp"
 #include "fw/forwarder.hpp"
@@ -42,6 +43,7 @@
 struct ProgramOptions
 {
   bool showUsage;
+  bool showVersion;
   bool showModules;
   std::string config;
 };
@@ -140,7 +142,8 @@
        << "Run NFD forwarding daemon\n"
        << "\n"
        << "Options:\n"
-       << "  [--help]   - print this help message\n"
+       << "  [--help]    - print this help message\n"
+       << "  [--version] - print version and exit\n"
        << "  [--modules] - list available logging modules\n"
        << "  [--config /path/to/nfd.conf] - path to configuration file "
        << "(default: " << DEFAULT_CONFIG_FILE << ")\n"
@@ -165,6 +168,7 @@
   parseCommandLine(int argc, char** argv, ProgramOptions& options)
   {
     options.showUsage = false;
+    options.showVersion = false;
     options.showModules = false;
     options.config = DEFAULT_CONFIG_FILE;
 
@@ -174,6 +178,7 @@
         { "help"   , no_argument      , 0, 0 },
         { "modules", no_argument      , 0, 0 },
         { "config" , required_argument, 0, 0 },
+        { "version", no_argument      , 0, 0 },
         { 0        , 0                , 0, 0 }
       };
       int c = getopt_long_only(argc, argv, "", longOptions, &optionIndex);
@@ -181,21 +186,24 @@
         break;
 
       switch (c) {
-        case 0:
-          switch (optionIndex) {
-            case 0: // help
-              options.showUsage = true;
-              break;
-            case 1: // modules
-              options.showModules = true;
-              break;
-            case 2: // config
-              options.config = ::optarg;
-              break;
-            default:
-              return false;
-          }
+      case 0:
+        switch (optionIndex) {
+        case 0: // help
+          options.showUsage = true;
           break;
+        case 1: // modules
+          options.showModules = true;
+          break;
+        case 2: // config
+          options.config = ::optarg;
+          break;
+        case 3: // version
+          options.showVersion = true;
+          break;
+        default:
+          return false;
+        }
+        break;
       }
     }
     return true;
@@ -246,11 +254,17 @@
     Nfd::printUsage(std::cerr, argv[0]);
     return 1;
   }
+
   if (options.showUsage) {
     Nfd::printUsage(std::cout, argv[0]);
     return 0;
   }
 
+  if (options.showVersion) {
+    std::cout << NFD_VERSION_BUILD_STRING << std::endl;
+    return 0;
+  }
+
   if (options.showModules) {
     Nfd::printModules(std::cout);
     return 0;