Merge pull request #100 from robotology/devel

Merge devel in master for the 1.6.0 release

Author: traversaro

.appveyor.yml

@@ -5,7 +5,6 @@ platform:
   - x64
 
 image:
- - Visual Studio 2013
  - Visual Studio 2015
  - Visual Studio 2017
 
@@ -21,18 +20,13 @@ environment:
     - BUILD_SHARED_LIBS: ON
     - BUILD_SHARED_LIBS: OFF
 
-matrix:
-  exclude:
-    - image: Visual Studio 2013
-      BUILD_SHARED_LIBS: OFF
 
 clone_folder: c:\dev\RTF
 
 init:
   # System related variables
   - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" set CMAKE_GENERATOR=Visual Studio 15 2017
   - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" set CMAKE_GENERATOR=Visual Studio 14 2015
-  - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" set CMAKE_GENERATOR=Visual Studio 12 2013
   - cmd: if "%platform%"=="x64" set CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64
   - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR%
 

.travis.yml

@@ -22,7 +22,7 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew tap robotology/cask; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew tap homebrew/science; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew tap homebrew/core; fi
 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

conf/RTFVersion.cmake

@@ -8,8 +8,8 @@
 ## manually increase tweak number when required. Set to zero when
 # bumping VERSION_PATCH
 set(RTF_VERSION_MAJOR "1")
-set(RTF_VERSION_MINOR "4")
-set(RTF_VERSION_PATCH "1")
+set(RTF_VERSION_MINOR "6")
+set(RTF_VERSION_PATCH "0")
 set(RTF_VERSION_TWEAK "")
 set(RTF_VERSION_STRING "")
 

doc/release/v1_6_0.md

@@ -0,0 +1,8 @@
+Robot Testing Framework 1.6.0 (2018-9-09) Release Notes
+========================================================
+
+Important Changes
+-----------------
+
+* Visual Studio 2013 is no longer supported, due to the use of constexpr in VOCAB4 macro ( https://github.com/robotology/robot-testing/pull/98 ).
+

src/plugins/dll/include/rtf/dll/SharedLibraryClassApi.h

@@ -81,7 +81,7 @@ extern "C" {
     SHLIBPP_SHARED_CLASS_FN int factoryname(void *api, int len) { \
         struct shlibpp::SharedLibraryClassApi *sapi = (struct shlibpp::SharedLibraryClassApi *) api; \
         if (len<(int)sizeof(shlibpp::SharedLibraryClassApi)) return -1; \
-        sapi->startCheck = VOCAB4('S','H','P','P'); \
+        sapi->startCheck = shlibpp::VOCAB('S','H','P','P'); \
         sapi->structureSize = sizeof(shlibpp::SharedLibraryClassApi); \
         sapi->systemVersion = 5; \
         sapi->create = factoryname ## _create; \
@@ -91,7 +91,7 @@ extern "C" {
         sapi->getClassName = factoryname ## _getClassName; \
         sapi->getBaseClassName = factoryname ## _getBaseClassName; \
         for (int i=0; i<SHLIBPP_SHAREDLIBRARYCLASSAPI_PADDING; i++) { sapi->roomToGrow[i] = 0; } \
-        sapi->endCheck = VOCAB4('P', 'L', 'U', 'G'); \
+        sapi->endCheck = shlibpp::VOCAB('P', 'L', 'U', 'G'); \
         return sapi->startCheck; \
     }
 // The double cast in the _create() and _destroy() functions are

src/plugins/dll/include/rtf/dll/SharedLibraryFactory.h

@@ -37,11 +37,11 @@ class shlibpp::SharedLibraryFactory {
      */
     enum {
         STATUS_NONE,                                         //!< Not configured yet.
-        STATUS_OK = VOCAB2('o','k'),                         //!< Present and sane.
-        STATUS_LIBRARY_NOT_FOUND = VOCAB4('f', 'o', 'u', 'n'),  //!< Named shared library was not found.
-        STATUS_LIBRARY_NOT_LOADED = VOCAB4('l','o','a','d'), //!< Named shared library failed to load.
-        STATUS_FACTORY_NOT_FOUND = VOCAB4('f','a','c','t'),  //!< Named method wasn't present in library.
-        STATUS_FACTORY_NOT_FUNCTIONAL = VOCAB3('r','u','n') //!< Named method is not working right.
+        STATUS_OK = VOCAB('o','k'),                         //!< Present and sane.
+        STATUS_LIBRARY_NOT_FOUND = VOCAB('f', 'o', 'u', 'n'),  //!< Named shared library was not found.
+        STATUS_LIBRARY_NOT_LOADED = VOCAB('l','o','a','d'), //!< Named shared library failed to load.
+        STATUS_FACTORY_NOT_FOUND = VOCAB('f','a','c','t'),  //!< Named method wasn't present in library.
+        STATUS_FACTORY_NOT_FUNCTIONAL = VOCAB('r','u','n') //!< Named method is not working right.
     };
 
     /**

src/plugins/dll/include/rtf/dll/Vocab.h

@@ -16,10 +16,7 @@ namespace shlibpp {
     class Vocab;
 
     // We need a macro for efficient switching.
-    #define VOCAB(a,b,c,d) ((((int)(d))<<24)+(((int)(c))<<16)+(((int)(b))<<8)+((int)(a)))
-    #define VOCAB4(a,b,c,d) VOCAB((a),(b),(c),(d))
-    #define VOCAB3(a,b,c) VOCAB((a),(b),(c),(0))
-    #define VOCAB2(a,b) VOCAB((a),(b),(0),(0))
+    constexpr int32_t VOCAB(char a, char b = 0, char c = 0, char d = 0)  { return ((((int32_t)(d))<<24)+(((int32_t)(c))<<16)+(((int32_t)(b))<<8)+((int32_t)(a))); }
 }
 
 

src/plugins/dll/include/rtf/dll/impl/DllPluginLoader_impl.h

@@ -62,7 +62,7 @@ class DllPluginLoaderImpl {
         open_internal(filename, factory_name);
 
         if (!plugin->factory.isValid()) {
-            if (plugin->factory.getStatus() == VOCAB4('f', 'a', 'c', 't')) {
+            if (plugin->factory.getStatus() == shlibpp::VOCAB('f', 'a', 'c', 't')) {
                 std::string plug_type = (factory_name == RTF_PLUGIN_FACTORY_NAME) ? "test case" : "fixture manager";
                 error = "cannot load plugin " + filename + "; (it is not a RTF " + plug_type + " plugin!)";
             }

src/plugins/dll/src/SharedLibraryFactory.cpp

@@ -78,10 +78,10 @@ bool shlibpp::SharedLibraryFactory::open(const char *dll_name, const char *fn_na
 
 bool shlibpp::SharedLibraryFactory::isValid() const
 {
-    if (returnValue != VOCAB4('S','H','P','P')) {
+    if (returnValue != VOCAB('S','H','P','P')) {
         return false;
     }
-    if (api.startCheck != VOCAB4('S','H','P','P')) {
+    if (api.startCheck != VOCAB('S','H','P','P')) {
         return false;
     }
     if (api.structureSize != sizeof(SharedLibraryClassApi)) {
@@ -90,7 +90,7 @@ bool shlibpp::SharedLibraryFactory::isValid() const
     if (api.systemVersion != 5) {
         return false;
     }
-    if (api.endCheck != VOCAB4('P','L','U','G')) {
+    if (api.endCheck != VOCAB('P','L','U','G')) {
         return false;
     }
     return true;

tests/api/VocabTest.cpp

@@ -23,9 +23,9 @@ class MyTest : public TestCase {
     virtual void run() {        
         RTF_TEST_CHECK(Vocab::encode("RTF") == (int)4609106, "checking Vocab::encode()");
         RTF_TEST_CHECK(Vocab::decode( Vocab::encode("RRTF")) == "RRTF", "checking Vocab::decode()");
-        RTF_TEST_CHECK(Vocab::decode( VOCAB2('R','T')) == "RT", "checking VOCAB2");
-        RTF_TEST_CHECK(Vocab::decode( VOCAB3('R','T', 'F')) == "RTF", "checking VOCAB3");
-        RTF_TEST_CHECK(Vocab::decode( VOCAB4('R','T', 'F', 'R')) == "RTFR", "checking VOCAB4");
+        RTF_TEST_CHECK(Vocab::decode( VOCAB('R','T')) == "RT", "checking VOCAB");
+        RTF_TEST_CHECK(Vocab::decode( VOCAB('R','T', 'F')) == "RTF", "checking VOCAB");
+        RTF_TEST_CHECK(Vocab::decode( VOCAB('R','T', 'F', 'R')) == "RTFR", "checking VOCAB");
     }
 };