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

Author: Andrii Moroz

.gitignore

@@ -15,9 +15,12 @@ report/*
 /bin/
 /lib/
 /out/
-/wd.gypi
 /wd.Makefile
 /Makefile
 /WebDriver.target.mk
 /WebDriverTest.target.mk
-*.log
+*.log
+WD.*
+desktop/
+flip/
+src/wdversion.cc

build.bat

@@ -0,0 +1 @@
+gyp --depth . -G output_dir=. -D platform=desktop -D mode=release --generator-output=out/ wd.gyp

build.sh

@@ -1,6 +1,18 @@
 #!/usr/bin/env bash
-platform=$1
-mode=$2
+output_gen=$1
+platform=$2
+mode=$3
+qt_dir=$4
+
+current_dir=`pwd`
+if [ -z $output_gen ];
+then
+  output_gen=`pwd`
+  platform="desktop"
+fi
+
+output_gen=`readlink -f ${output_gen}`
+base_output_gen=`dirname ${output_gen}`
 
 if [ -z $platform ];
 then
@@ -10,27 +22,41 @@ else
 fi
 if [ -z $mode ];
 then
-  modes="debug release"
+  modes="release_dbg release"
 else
   modes=$mode
 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
+
 for platform in $platforms
 do
   for mode in $modes
   do
-    gyp --depth . -G output_dir=. -D platform=$platform -D mode=$mode --generator-output=out/$platform/$mode wd.gyp
+    cd $current_dir
+    gyp --depth . -G output_dir=. -D platform=$platform -D mode=$mode -D ROOT_PATH=${base_output_gen} -D QT_DIR=${qt_dir} --generator-output=${output_gen}/$platform/$mode wd.gyp
     [ $? -ne 0 ] && exit 1
-    cd out/$platform/$mode
+    cd ${output_gen}/$platform/$mode
+    [ $? -ne 0 ] && echo "**** ERROR: Can't access to ${output_gen}/$platform/$mode" && exit 1
     make
     [ $? -ne 0 ] && exit 1
-    cd ../../..
-    mkdir -p bin/$platform/$mode/
-    cp -f out/$platform/$mode/Default/libWebDriver.a bin/$platform/$mode/
-    cp -f out/$platform/$mode/Default/lib.target/libWebDriver.so bin/$platform/$mode/ 2>/dev/null
-    if [ -f out/$platform/$mode/Default/WebDriver ]
+    mkdir -p ${output_gen}/bin/$platform/$mode/
+    [ $? -ne 0 ] && echo "**** ERROR: Can't create ${output_gen}/bin/$platform/$mode" && exit 1
+    cp -f ${output_gen}/$platform/$mode/Default/libWebDriver.a ${output_gen}/bin/$platform/$mode/ 2>/dev/null
+    cp -f ${output_gen}/$platform/$mode/Default/lib.target/libWebDriver.so ${output_gen}/bin/$platform/$mode/ 2>/dev/null
+    if [ -f ${output_gen}/$platform/$mode/Default/WebDriver ]
     then
-      cp -f out/$platform/$mode/Default/WebDriver bin/$platform/$mode/
+      cp -f ${output_gen}/$platform/$mode/Default/WebDriver ${output_gen}/bin/$platform/$mode/ 2>/dev/null
     fi
   done
 done

inc/QtWebkitWebDriver.h inc/WebDriver.hinc/QtWebkitWebDriver.h renamed to inc/WebDriver.h

@@ -2,10 +2,10 @@
 #define WEBDRIVER_H
 /**
   * @mainpage This is autogenerated documentation for QtWebKitWebDriver. <br>
-  * Public API for WD is in file inc/QtWebkitWebDriver.h
+  * Public API for WD is in file inc/WebDriver.h
   */
 /** @file
-  * public API of QtWebkitWD
+  * public API of WebDriver
 */
 
 #include <viewfactory.h>

inc/viewfactory.h

@@ -5,22 +5,22 @@
 
 #include <QtCore/QGlobalStatic>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-#include <QtWidgets/QWidget>
+#include <QtWebKitWidgets/QWebView>
 #else
-#include <QtGui/QWidget>
+#include <QtWebKit/QWebView>
 #endif
 
 class AbstractViewCreator
 {
 public:
-    virtual QWidget * create() const = 0;
+    virtual QWebView * create() const = 0;
 };
 
 template <class C>
 class ViewCreator: public AbstractViewCreator
 {
 public:
-    virtual QWidget* create() const { return new C(); }
+    virtual QWebView * create() const { return new C(); }
 };
 
 class ViewFactory
@@ -37,7 +37,7 @@ class ViewFactory
             factory[id] = new ViewCreator<C>();
     }
 
-    QWidget* create(const std::string &id);
+    QWebView * create(const std::string &id);
 
 
 protected:

src/ServerThread.cc

@@ -0,0 +1,7 @@
+#include "ServerThread.h"
+#include "WebDriver.h"
+
+void ServerThread::run()
+{
+  main_server(argc, argv);
+}

src/ServerThread.h

@@ -0,0 +1,18 @@
+#ifndef SERVERTHREAD_H
+#define SERVERTHREAD_H
+
+#include <QtCore/QThread>
+
+class ServerThread : public QThread
+{
+  Q_OBJECT
+
+public:
+  int   argc;
+  char** argv;
+  
+protected:
+  void run();
+};
+
+#endif // SERVERTHREAD_H