Added version info

Author: nataliakoval

build.bat

@@ -1 +1,5 @@
+@ECHO OFF
+
+python generate_wdversion.py
+
 gyp --depth . -G output_dir=. -D platform=desktop -D mode=release --generator-output=out/ wd.gyp

build.sh

@@ -26,6 +26,9 @@ else
   modes=$mode
 fi
 
+#generate wdversion.cc
+python generate_wdversion.py
+
 for platform in $platforms
 do
   for mode in $modes

generate_wdversion.py

@@ -0,0 +1,19 @@
+import subprocess as sp
+
+filename = "./src/wdversion.cc"
+p = sp.Popen(["git", "describe" , "--abbrev=10", "--dirty", "--always"], stdin=sp.PIPE, stdout=sp.PIPE)
+
+data = p.stdout.readline()
+
+versionfile = open (filename, 'w')
+versionfile.write("namespace webdriver {\n")
+versionfile.write("extern const char kProductName[] = \"WebDriver-cisco-cmt\";\n")
+versionfile.write("extern const char kVersionNumber[] = \"0.2.0\";\n")
+versionfile.write("extern const char kBuildTime[] = __TIME__;\n")
+versionfile.write("extern const char kBuildDate[] = __DATE__;\n")
+versionfile.write("extern const char kLastChanges[] = \"" + data.strip() + "\";\n")
+versionfile.write("}")
+versionfile.close()
+
+p.stdout.close()
+p.stdin.close()

inc/versioninfo.h

@@ -0,0 +1,31 @@
+#ifndef VERSIONINFO_H
+#define VERSIONINFO_H
+
+#include <string>
+
+namespace webdriver {
+
+/// @brief This class contains information about version webdriver
+class VersionInfo {
+public:
+    VersionInfo();
+    ~VersionInfo();
+
+    /// @return Name of webdriver, e.g. "WebDriver" or "Google Chrome".
+    std::string Name() const;
+
+    /// @return Version number as a string, e.g. "0.1.0".
+    std::string Version() const;
+
+    /// @return The git revision of this release.
+    std::string LastChange() const;
+
+    /// @return The version string, which contains the name of webdriver, version number and git revision
+    std::string CreateVersionString() const;
+
+    /// @return The date and time of last build.
+    std::string BuildDateTime() const;
+};
+
+}
+#endif // VERSIONINFO_H

src/webdriver/versioninfo.cc

@@ -0,0 +1,45 @@
+#include "versioninfo.h"
+#include "webdriver_version.h"
+
+namespace webdriver {
+
+VersionInfo::VersionInfo()
+{
+}
+
+VersionInfo::~VersionInfo()
+{
+}
+
+std::string VersionInfo::Name() const
+{
+    return kProductName;
+}
+
+std::string VersionInfo::Version() const
+{
+    return kVersionNumber;
+}
+
+std::string VersionInfo::LastChange() const
+{
+    return kLastChanges;
+}
+
+std::string VersionInfo::BuildDateTime() const
+{
+    std::string buildTime = kBuildTime;
+    std::string buildDate = kBuildDate;
+    return buildDate + " " + buildTime;
+}
+
+std::string VersionInfo::CreateVersionString() const
+{
+    std::string current_version;
+    current_version = "Version:    "+ Name() + "-" + Version() +
+                    "\nBuild Time: "+ BuildDateTime() +
+                    "\nRevision:   " + LastChange();
+    return current_version;
+}
+
+}

src/webdriver/webdriver_server.cc

@@ -25,8 +25,7 @@
 
 #include "webdriver_route_patterns.h"
 #include "url_command_wrapper.h"
-
-
+#include "versioninfo.h"
 
 namespace webdriver {
 
@@ -40,6 +39,7 @@ Server::Server()
 Server::~Server() {};
 
 int Server::Init(int argc, char *argv[]) {
+    base::AtExitManager exit;
     int ret_val = 0;
 
     if (state_ != STATE_UNCONFIGURED) {
@@ -108,8 +108,9 @@ int Server::Init(int argc, char *argv[]) {
 
     SessionManager::GetInstance()->set_url_base(url_base_);
 
-    std::string chromedriver_info = base::StringPrintf("ChromeDriver %s", "QtWebKit");
-    GlobalLogger::Log(kInfoLogLevel, chromedriver_info);
+    std::string driver_info = "*** Webdriver ****\nVersion:    "+ version_info.Name() + "-" + version_info.Version() +
+                            "\nBuild Time: "+ version_info.BuildDateTime() ;
+    GlobalLogger::Log(kInfoLogLevel, driver_info);
 
     // set default route table
     routeTable_.reset(new DefaultRouteTable());

src/webdriver/webdriver_version.cc

@@ -0,0 +1,7 @@
+namespace webdriver {
+extern const char kProductName[] = "WebDriver-cisco-cmt";
+extern const char kVersionNumber[] = "0.2.0";
+extern const char kBuildTime[] = __TIME__;
+extern const char kBuildDate[] = __DATE__;
+extern const char kLastChanges[] = "4e6d397080-dirty";
+}

src/webdriver/webdriver_version.h

@@ -0,0 +1,15 @@
+#ifndef WDVERSION_H
+#define WDVERSION_H
+
+namespace webdriver
+{
+
+extern const char kProductName[];
+extern const char kVersionNumber[];
+extern const char kBuildTime[];
+extern const char kBuildDate[];
+extern const char kLastChanges[];
+
+}
+
+#endif // WDVERSION_H

wd.gyp

@@ -51,7 +51,7 @@
             'src/Test/WindowTest.cc',
             'src/Test/FindingTest.cc',
             'src/Test/CoordinatesTest.cc',
-	          'src/Test/ElementAttributeTest.cc',
+            'src/Test/ElementAttributeTest.cc',
             'src/Test/ElementAttributeTest.h',
             '<(INTERMEDIATE_DIR)/moc_ElementAttributeTest.cc',
           ],
@@ -323,6 +323,8 @@
         'src/webdriver/webdriver_util.cc',
         'src/webdriver/webdriver_view_runner.cc',
         'src/webdriver/url_command_wrapper.cc',
+        'src/webdriver/versioninfo.cc',
+        'src/webdriver/webdriver_version.cc',
 
 
         # TODO: files below belong to custom implementation