Merge branch 'master' of https://portal-ua.globallogic.com/git/wd

Author: Andrii Moroz

.gitignore

@@ -23,4 +23,5 @@ report/*
 WD.*
 desktop/
 flip/
-src/wdversion.cc
+src/wdversion.cc
+wd.gypi

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

@@ -28,16 +28,7 @@ else
 fi
 
 #generate wdversion.cc
-last_changes=`git describe --abbrev=10 --dirty --always`
-version_file=src/wdversion.cc
-
-printf '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[] = "%s";
-}' $last_changes > $version_file
+python generate_wdversion.py
 
 for platform in $platforms
 do

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()