Merge branch 'master' of github.com:trikset/trikRuntime

Conflicts:
	trikControl/config.xml

Author: dvvrd

.travis.yml

@@ -0,0 +1,33 @@
+language: cpp
+compiler: gcc
+
+env:
+  - CONFIG=debug     VERA=true
+  - CONFIG=release   VERA=false
+
+install:
+  - if [ "$CXX" = "g++" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
+  - if [ "$CXX" = "g++" ]; then sudo apt-get update -qq; fi
+  - if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi
+  - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50; fi
+  - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50; fi
+  - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty universe"
+  - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty main"
+  - sudo add-apt-repository ppa:smspillaz/verapp-latest -y
+  - sudo apt-get update
+  - sudo apt-get install libboost-system-dev libboost-wave-dev tcl
+  - sudo apt-get install vera++
+  - sudo apt-get install qdbus qmlscene qt5-default qt5-qmake qtbase5-dev-tools qtchooser qtdeclarative5-dev xbitmaps xterm libqt5svg5-dev qttools5-dev qtscript5-dev -y
+  - sudo apt-get install xvfb
+  - Xvfb :0 &
+  - export DISPLAY=:0
+
+script:
+  - gcc --version
+  - qmake --version
+  - if [ "$VERA" = "true" ]; then tclsh vera++/generatePaths.tcl; fi
+  - if [ "$VERA" = "true" ]; then vera++ --error -p allRules --root vera++ <vera++/params; fi
+  - qmake trikRuntime.pro CONFIG+=$CONFIG
+  - make -j2
+  - cd ./bin
+  - ls -A

README.md

@@ -1,4 +1,4 @@
-trikRuntime
+trikRuntime  [![Build Status](https://travis-ci.org/trikset/trikRuntime.svg?branch=master)](https://travis-ci.org/trikset/trikRuntime)
 ===========
 
 Runtime for TRIK controller.
@@ -10,8 +10,9 @@ Consists of following subprojects:
 - trikRun: command-line utility to execute Qt Script files.
 - trikServer: command-line server for network communications, uses trikCommunicator library.
 - trikGui: user interface that can show various settings (like IP address), file system, run scripts, act as a server with trikCommunicator and so on.
+- trikKernel: library with common code for all other projects.
 
 Special thanks to:
 - Nikita Batov (https://github.com/Batov) for I2C direct access example.
 - Roman Kurbatov (https://github.com/romankurbatov) for his desktop environment code used in trikGui.
-- Anna Semakova for various artwork in "media" folder.
+- Anna Semakova for various artwork in "media" folder.

docs/trikRuntime.vpp

@@ -15,10 +15,8 @@
 # Build settings common to all projects in TrikRuntime.
 # Provides:
 # CONFIGURATION_SUFFIX variable that shall be consistently used in TARGET and LIBS variables in all projects.
-#
-# Depends on:
-# FILES_TO_COPY variable for a list of additional files and directories which needed to be copied after build to
-#		target directory.
+# copyToDestdir function to copy arbitrary files and directories to DESTDIR
+# uses function to automatically add a library to INCLUDEPATH and LIBS.
 
 CROSS_COMPILE = $$(CROSS_COMPILE)
 
@@ -42,6 +40,11 @@ CONFIG(debug, debug | release) {
 
 DESTDIR = $$PWD/bin/$$CONFIGURATION
 
+PROJECT_BASENAME = $$basename(_PRO_FILE_)
+PROJECT_NAME = $$section(PROJECT_BASENAME, ".", 0, 0)
+
+TARGET = $$PROJECT_NAME$$CONFIGURATION_SUFFIX
+
 equals(TEMPLATE, app) {
 	!macx {
 		QMAKE_LFLAGS += -Wl,-O1,-rpath,.
@@ -54,15 +57,51 @@ MOC_DIR = .build/$$CONFIGURATION/.moc
 RCC_DIR = .build/$$CONFIGURATION/.rcc
 UI_DIR = .build/$$CONFIGURATION/.ui
 
+INCLUDEPATH += $$_PRO_FILE_PWD_ \
+	$$_PRO_FILE_PWD_/include/$$PROJECT_NAME \
+
 unix {
 	target.path = $$[INSTALL_ROOT]/
 	INSTALLS += target
 }
 
-!isEmpty(FILES_TO_COPY) {
-	win32 {
-		QMAKE_POST_LINK = "xcopy $$replace(FILES_TO_COPY, /, \\) $$replace(DESTDIR, /, \\) /s /e /q /y /i"
-	} else {
-		QMAKE_POST_LINK = "cp -rf $$FILES_TO_COPY $$DESTDIR"
+QMAKE_CXXFLAGS += -std=c++11
+QMAKE_CXXFLAGS += -Wextra -Wcast-qual -Wwrite-strings -Wredundant-decls -Wunreachable-code -Wnon-virtual-dtor -Woverloaded-virtual
+
+GLOBAL_PWD = $$PWD
+
+# Useful function to copy additional files to destination,
+# from http://stackoverflow.com/questions/3984104/qmake-how-to-copy-a-file-to-the-output
+defineTest(copyToDestdir) {
+	FILES = $$1
+
+	for(FILE, FILES) {
+		# This ugly code is needed because xcopy requires to add source directory name to target directory name when copying directories
+		win32:AFTER_SLASH = $$section(FILE, "/", -1, -1)
+		win32:BASE_NAME = $$section(FILE, "/", -2, -2)
+		win32:equals(AFTER_SLASH, ""):DESTDIR_SUFFIX = /$$BASE_NAME
+
+		win32:FILE ~= s,/$,,g
+
+		win32:FILE ~= s,/,\,g
+		DDIR = $$DESTDIR$$DESTDIR_SUFFIX/
+		win32:DDIR ~= s,/,\,g
+
+		QMAKE_POST_LINK += $(COPY_DIR) $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
+	}
+
+	export(QMAKE_POST_LINK)
+}
+
+defineTest(uses) {
+	LIBS += -L$$DESTDIR
+	PROJECTS = $$1
+
+	for(PROJECT, PROJECTS) {
+		LIBS += -l$$PROJECT$$CONFIGURATION_SUFFIX
+		INCLUDEPATH += $$GLOBAL_PWD/$$PROJECT/include
 	}
+
+	export(LIBS)
+	export(INCLUDEPATH)
 }

global.pri

@@ -0,0 +1,2 @@
+tclsh vera++/generatePaths.tcl
+vera++ --error -p allRules --root vera++ <vera++/params

runVera++.bat

@@ -0,0 +1,3 @@
+#!/bin/sh
+tclsh vera++/generatePaths.tcl
+vera++ --error -p allRules --root vera++ <vera++/params

runVera++.sh

@@ -27,7 +27,6 @@ class TrikScriptRunner;
 
 namespace trikCommunicator {
 
-class ScriptRunnerWrapper;
 class Connection;
 
 /// Class that enables connection with a client running on computer (TrikLab or remote control).
@@ -41,7 +40,8 @@ class TrikCommunicator : public QTcpServer
 public:
 	/// Constructor that creates its own instance of a script runner.
 	/// @param configPath - path to config file for trikControl, for example, /home/root/trik/.
-	explicit TrikCommunicator(QString const &configFilePath);
+	/// @param startDirPath - path to the directory from which the application was executed.
+	explicit TrikCommunicator(QString const &configFilePath, QString const &startDirPath);
 
 	/// Constructor that accepts external script runner and issues commands to it.
 	explicit TrikCommunicator(trikScriptRunner::TrikScriptRunner &runner);
@@ -73,7 +73,12 @@ private slots:
 	void init();
 
 	/// Script runner object common to all connections.
-	QScopedPointer<ScriptRunnerWrapper> mScriptRunnerWrapper;
+	/// Ownership depends on mHasScriptRunnerOwnership flag, if we received runner belonging to other object or created
+	/// our own.
+	trikScriptRunner::TrikScriptRunner *mTrikScriptRunner;
+
+	/// True, if we created our own script runner, false if we got it from someone.
+	bool const mHasScriptRunnerOwnership;
 
 	/// Maps thread object to corresponding connection worker object, to be able to correctly stop and delete them all.
 	QHash<QThread *, Connection *> mConnections;  // Has ownership over threads and connections.

trikCommunicator/include/trikCommunicator/trikCommunicator.h

@@ -17,19 +17,21 @@
 #include <QtCore/QTextStream>
 #include <QtCore/QThread>
 
+#include <trikKernel/fileUtils.h>
+#include <trikScriptRunner/trikScriptRunner.h>
+
 #include "src/connection.h"
-#include "src/scriptRunnerWrapper.h"
 
 using namespace trikCommunicator;
 
 Connection::Connection()
-	: mScriptRunnerWrapper(NULL)
+	: mTrikScriptRunner(NULL)
 {
 }
 
-void Connection::init(int socketDescriptor, ScriptRunnerWrapper *scriptRunnerWrapper)
+void Connection::init(int socketDescriptor, trikScriptRunner::TrikScriptRunner *trikScriptRunner)
 {
-	mScriptRunnerWrapper = scriptRunnerWrapper;
+	mTrikScriptRunner = trikScriptRunner;
 	mSocket.reset(new QTcpSocket());
 
 	if (!mSocket->setSocketDescriptor(socketDescriptor)) {
@@ -67,17 +69,17 @@ void Connection::onReadyRead()
 
 		QString const fileName = command.left(separatorPosition);
 		QString const fileContents = command.mid(separatorPosition + 1);
-		writeToFile(fileName, fileContents);
+		trikKernel::FileUtils::writeToFile(fileName, fileContents);
 	} else if (command.startsWith("run")) {
 		command.remove(0, QString("run:").length());
-		QString const fileContents = readFromFile(command);
-		QMetaObject::invokeMethod(mScriptRunnerWrapper, "run", Q_ARG(QString, fileContents));
+		QString const fileContents = trikKernel::FileUtils::readFromFile(command);
+		QMetaObject::invokeMethod(mTrikScriptRunner, "run", Q_ARG(QString, fileContents));
 		emit startedScript(command);
 	} else if (command == "stop") {
-		QMetaObject::invokeMethod(mScriptRunnerWrapper, "stop");
+		QMetaObject::invokeMethod(mTrikScriptRunner, "abort");
 	} else if (command.startsWith("direct")) {
 		command.remove(0, QString("direct:").length());
-		QMetaObject::invokeMethod(mScriptRunnerWrapper, "run", Q_ARG(QString, command));
+		QMetaObject::invokeMethod(mTrikScriptRunner, "run", Q_ARG(QString, command));
 		emit startedDirectScript();
 	}
 }
@@ -87,33 +89,3 @@ void Connection::disconnected()
 	qDebug() << "Disconnected.";
 	thread()->quit();
 }
-
-QString Connection::readFromFile(QString const &fileName)
-{
-	QFile file(fileName);
-	file.open(QIODevice::ReadOnly | QIODevice::Text);
-	if (!file.isOpen()) {
-		throw "Reading failed";
-	}
-
-	QTextStream input;
-	input.setDevice(&file);
-	input.setCodec("UTF-8");
-	QString const result = input.readAll();
-	file.close();
-	return result;
-}
-
-void Connection::writeToFile(QString const &fileName, QString const &contents)
-{
-	QFile file(fileName);
-	file.open(QIODevice::WriteOnly | QIODevice::Text);
-	if (!file.isOpen()) {
-		throw "File open operation failed";
-	}
-
-	QTextStream stream(&file);
-	stream.setCodec("UTF-8");
-	stream << contents;
-	file.close();
-}

trikCommunicator/src/connection.cpp

@@ -18,9 +18,11 @@
 #include <QtCore/QScopedPointer>
 #include <QtNetwork/QTcpSocket>
 
-namespace trikCommunicator {
+namespace trikScriptRunner {
+class TrikScriptRunner;
+}
 
-class ScriptRunnerWrapper;
+namespace trikCommunicator {
 
 /// Class that serves one client of TrikCommunicator. Meant to work in separate thread. Creates its own socket and
 /// handles all incoming messages, calling ScriptRunnerWrapper for brick functionality.
@@ -48,7 +50,7 @@ public slots:
 	/// Creates socket and initializes connection, shall be called when Connection is already in its own thread.
 	/// @param socketDescriptor - native socket descriptor.
 	/// @param scriptRunnerWrapper - instance of script runner object.
-	void init(int socketDescriptor, ScriptRunnerWrapper *scriptRunnerWrapper);
+	void init(int socketDescriptor, trikScriptRunner::TrikScriptRunner *trikScriptRunner);
 
 private slots:
 	/// New data is ready on a socket.
@@ -58,14 +60,12 @@ private slots:
 	void disconnected();
 
 private:
-	static QString readFromFile(QString const &fileName);
-	static void writeToFile(QString const &fileName, QString const &contents);
-
 	/// Socket for this connection.
 	QScopedPointer<QTcpSocket> mSocket;
 
 	/// Common script runner object, located in another thread.
-	ScriptRunnerWrapper *mScriptRunnerWrapper;  // Does not have ownership.
+	/// Does not have ownership.
+	trikScriptRunner::TrikScriptRunner *mTrikScriptRunner;
 };
 
 }