Merge branch 'devel'

Author: Andrea Ruzzenenti

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.2.{build}
+version: 1.4.{build}
 
 platform:
   - Win32
@@ -14,7 +14,17 @@ configuration:
   - Debug
 
 environment:
-  CTEST_OUTPUT_ON_FAILURE: 1
+  global:
+    CTEST_OUTPUT_ON_FAILURE: 1
+
+  matrix:
+    - BUILD_SHARED_LIBS: ON
+    - BUILD_SHARED_LIBS: OFF
+
+matrix:
+  exclude:
+    - image: Visual Studio 2013
+      BUILD_SHARED_LIBS: OFF
 
 clone_folder: c:\dev\RTF
 
@@ -30,8 +40,8 @@ build_script:
   - cd c:\dev\RTF
   - md build
   - cd build
-  - cmake -G"%CMAKE_GENERATOR%" ..
+  - cmake -G"%CMAKE_GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% ..
   - msbuild /m /p:Configuration="%CONFIGURATION%" /p:Platform="%platform%" RTF.sln
 
 test_script:
-  - cmd: cmake --build %APPVEYOR_BUILD_FOLDER%\build --target RUN_TESTS --config %CONFIGURATION%
+  - cmd: ctest --output-on-failure --build-config %CONFIGURATION%

.travis.yml

@@ -12,8 +12,11 @@ os:
   - osx
 
 env:
-  - TRAVIS_BUILD_TYPE=Debug
-  - TRAVIS_BUILD_TYPE=Release
+  global:
+    - CTEST_OUTPUT_ON_FAILURE=1
+  matrix:
+    - TRAVIS_BUILD_TYPE=Debug
+    - TRAVIS_BUILD_TYPE=Release
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
@@ -24,12 +27,12 @@ install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew outdated cmake || brew upgrade cmake; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then if !  brew ls --versions python > /dev/null; then brew install python; fi; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install tinyxml lua51; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y cmake libtinyxml-dev liblua5.1-dev python-dev lcov; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y cmake3 libtinyxml-dev liblua5.1-dev python-dev lcov; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo gem install coveralls-lcov; fi
 
 before_script:
   - python --version
-  - ruby --version  
+  - ruby --version
 
 script:
   # configure robot-testing framework
@@ -39,10 +42,10 @@ script:
   - if [ "$TRAVIS_OS_NAME" == "osx" ];   then cmake -DCMAKE_BUILD_TYPE=${TRAVIS_BUILD_TYPE} -DENABLE_LUA_PLUGIN:BOOL=ON -DENABLE_PYTHON_PLUGIN:BOOL=ON -DENABLE_WEB_LISTENER:BOOL=ON ..; fi
   - make
   - ctest --output-on-failure --build . -C ${TRAVIS_BUILD_TYPE}
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then  make RTF_coverage ; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then make RTF_coverage ; fi
   - sudo make install
 
-after_success:  
+after_success:
   - coveralls-lcov --repo-token Gcfb0Rzm9kFpzrwyT5NiQQivi2oWvvjdm coverage.info.cleaned
 #  - bash <(curl -s https://codecov.io/bash)
 

CMakeLists.txt

@@ -5,9 +5,13 @@
 #  Copy Policy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
 #
 
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 project(RTF)
 
+# enforce the use of C++11
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Pick up our CMake scripts - they are all in the conf subdirectory.
 set(RTF_MODULE_PATH ${PROJECT_SOURCE_DIR}/conf)
@@ -56,7 +60,8 @@ set(INSTALL_RTF_RUBY_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include)
 install_basic_package_files(${PROJECT_NAME}
                             VERSION ${RTF_VERSION}
                             COMPATIBILITY AnyNewerVersion
-                            TARGETS_PROPERTY RTF_LIBS
+                            TARGETS_PROPERTIES RTF_LIBS
+                                               RTF_TOOLS
                             EXTRA_PATH_VARS_SUFFIX DLL_INCLUDEDIR
                                                    LUA_INCLUDEDIR
                                                    PYTHON_INCLUDEDIR

README.md

@@ -20,15 +20,15 @@ test cases are developed as independent plug-ins (i.e., using scripting language
 loaded and executed by an automated test runner. Moreover, a fixture manager prepares the setup (e.g., running robot interfaces,
 simulator) and actively monitors that all the requirements for running the tests are satisfied during the execution of the tests.
 These functionalities along with other facilities such as the test result collector, result formatter and remote interface allow
-for rapid development of test units to cover different levels of system testing (see the block diagram). 
+for rapid development of test units to cover different levels of system testing (see the block diagram).
 
 ![rtf-arch](/doc/rtf_arch.png)
 
 
 Installation
 ------------
 RTF library does not depend on any external library. The RTF framework has a testrunner utility (see Running test case plug-ins
-using testrunner) to easily run the test cases which are built as plug-ins. Test cases can be organized in test suits using simple XML files. The testrunner uses TinyXml library for parsing the suit XML files. RTF build system check for the installation
+using testrunner) to easily run the test cases which are built as plug-ins. Test cases can be organized in test suites using simple XML files. The testrunner uses TinyXml library for parsing the suite XML files. RTF build system check for the installation
 of TinyXml and, in case, it cannot find any installed version of TinyXml library, it uses the internal version which is delivered
 with the RTF.
 
@@ -41,7 +41,7 @@ with the RTF.
     $ make install  # Optional!
 ```
 
-- **On Windows:** The installation is easy, straightforward and uses the CMake build system. Get [Cmake for windows](https://cmake.org/download/) if you have not yet installed. Then simply run the Cmake and, set the project (robot-testing) root folder and the desired build folder. Configure and generate project solution for your favorite IDE (e.g. Visual Studio 13). Then open the solution from your IDE and build the project.   
+- **On Windows:** The installation is easy, straightforward and uses the CMake build system. Get [Cmake for windows](https://cmake.org/download/) if you have not yet installed. Then simply run the Cmake and, set the project (robot-testing) root folder and the desired build folder. Configure and generate project solution for your favorite IDE (e.g. Visual Studio 13). Then open the solution from your IDE and build the project.
 
 Configuration
 -------------
@@ -59,16 +59,16 @@ The only thing you need to configure is the RTF_DIR environment variable so that
     C:\> setx.exe PATH "%PATH%;%RTF_DIR%/<Release/Debug>/bin"
 ```
 
-*Notice:* If you have **not** installed RTF in the statndard system path (e.g., on Linx without `make install`) then You need to exapnd your system `PATH` environment variable. 
+*Notice:* If you have **not** installed RTF in the statndard system path (e.g., on Linx without `make install`) then You need to exapnd your system `PATH` environment variable.
 
 
-Enabling Python, Ruby, Lua, ... Plugins 
+Enabling Python, Ruby, Lua, ... Plugins
 ----------------------------------------
-To use RTF with other languages, 
- - first you need to install their development packages (e.g. for Python on Linux you need `python-dev`, for Ruby: `ruby-dev` or for Lua: `liblua5.x-dev`). 
+To use RTF with other languages,
+ - first you need to install their development packages (e.g. for Python on Linux you need `python-dev`, for Ruby: `ruby-dev` or for Lua: `liblua5.x-dev`).
  - then you can enable the desired language into RTF Cmake (e.g. ENABLE_PYTHON_PLUGIN=ON for enabling python)
- - compile and build RTF 
- 
+ - compile and build RTF
+
 
 Tutorials and Examples
 -----------------------