Changeset 59521 in vbox for trunk/src/VBox/Frontends/VBoxBugReport

Timestamp:

Jan 29, 2016 1:19:08 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

105304

Message:

BugReportTool(bugref:8169): version reporting

File:

• trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp

@@ -27 +27 @@
 #include <VBox/version.h>
 
+#include <iprt/buildconfig.h>
 #include <iprt/env.h>
 #include <iprt/file.h>
@@ -75 +76 @@
     "   any VM names provided and included all registered machines.\n"
     "Options:\n"
-    "   -h, -help,   --help    Print usage information\n"
-    "   -A, -all,    --all     Include all registered machines\n"
-    "   -o, -output, --output  Specifies the name of the output file\n"
-    "   -t, -text,   --text    Produce a single text file instead of compressed TAR\n"
+    "   -h, -help,    --help     Print usage information\n"
+    "   -A, -all,     --all      Include all registered machines\n"
+    "   -o, -output,  --output   Specifies the name of the output file\n"
+    "   -t, -text,    --text     Produce a single text file instead of compressed TAR\n"
+    "   -V, -version, --version  Print version number and exit\n"
     "\n";
 
@@ -491 +493 @@
 
 
+static void printHeader(void)
+{
+    RTStrmPrintf(g_pStdErr, VBOX_PRODUCT " Bug Report Tool " VBOX_VERSION_STRING "\n"
+                 "(C) " VBOX_C_YEAR " " VBOX_VENDOR "\n"
+                 "All rights reserved.\n\n");
+}
+
 int main(int argc, char *argv[])
 {
@@ -498 +507 @@
      */
     RTR3InitExe(argc, &argv, 0);
-
-    RTStrmPrintf(g_pStdErr, VBOX_PRODUCT " Bug Report Tool " VBOX_VERSION_STRING "\n"
-                 "(C) " VBOX_C_YEAR " " VBOX_VENDOR "\n"
-                 "All rights reserved.\n\n");
 
     bool fAllMachines = false;
@@ -520 +525 @@
         {
             case 'h':
+                printHeader();
                 RTStrmPrintf(g_pStdErr, g_szUsage, argv[0]);
                 return 0;
@@ -531 +537 @@
                 fTextOutput = true;
                 break;
+            case 'V':
+                RTPrintf("%sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr());
+                return 0;
             case VINF_GETOPT_NOT_OPTION:
                 nameList.push_back(ValueUnion.psz);
@@ -538 +547 @@
         }
     }
+
+    printHeader();
 
     HRESULT hr = S_OK;