eProsima · MiguelCompany · May 14, 2019 · Mar 5, 2019 · Mar 5, 2019 · Mar 14, 2019
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -224,12 +224,28 @@ option(SECURITY "Activate security" OFF)
 
 if(SECURITY)
     find_package(OpenSSL REQUIRED)
+else()
+    find_package(OpenSSL)
+endif()
+
+option(NO_TLS "Disables TLS Support" OFF)
+if(OpenSSL_FOUND AND NOT NO_TLS)
+    set(TLS_FOUND 1)
+else()
+    set(TLS_FOUND 0)
+endif()
+
+if(SECURITY OR TLS_FOUND)
+    set(LINK_SSL 1)
+else()
+    set(LINK_SSL 0)
 endif()
 
 ###############################################################################
 # Java application
 ###############################################################################
 option(BUILD_JAVA "Activate the compilation of the Java application" OFF)
+option(TEST_JAVA "Perform testing when compile the Java application" OFF)
 
 if(EPROSIMA_INSTALLER)
     set(BUILD_JAVA ON)
@@ -238,7 +254,13 @@ endif()
 if(BUILD_JAVA)
     include(${PROJECT_SOURCE_DIR}/cmake/dev/java_support.cmake)
 
-    gradle_build(${PROJECT_SOURCE_DIR}/${PROJECT_NAME}gen
+    if(TEST_JAVA)
+        set(CMD_JAVA "build")
+    else()
+        set(CMD_JAVA "assemble")
+    endif()
+
+    gradle_build(${PROJECT_SOURCE_DIR}/${PROJECT_NAME}gen ${CMD_JAVA}
         THIRDPARTY_DEPENDENCY idl
         THIRDPARTY_DEPENDENCY fastcdr
         )

diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@
 [![Stars](https://img.shields.io/github/stars/eProsima/Fast-RTPS.svg)](https://github.com/eProsima/Fast-RTPS/stargazers)
 
 <a href="http://www.eprosima.com"><img src="https://encrypted-tbn3.gstatic.com/images?q=tbn:ANd9GcSd0PDlVz1U_7MgdTe0FRIWD0Jc9_YH-gGi0ZpLkr-qgCI6ZEoJZ5GBqQ" align="left" hspace="8" vspace="2" width="100" height="100" ></a>
+
 *eprosima Fast RTPS* is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, 
 as defined and maintained by the Object Management Group (OMG) consortium. RTPS is also the wire interoperability protocol defined for the Data Distribution
 Service (DDS) standard, again by the OMG. *eProsima Fast RTPS* holds the benefit of being standalone and up-to-date, as most vendor solutions either implement RTPS as a tool to implement 
@@ -24,7 +25,7 @@ network.
 system input/output channel combination for each deployment.
 * Two API Layers: a high-level Publisher-Subscriber one focused on usability and a lower-level Writer-Reader one that provides finer access to the inner workings of the RTPS protocol.
 
-eProsima Fast RTPS has been adopted by multiple organizations in many sectors including these important cases:
+*eProsima Fast RTPS* has been adopted by multiple organizations in many sectors including these important cases:
 
 * Robotics: ROS (Robotic Operating System) as their default middleware for ROS2.
 * EU R&D: FIWARE Incubated GE.
@@ -52,13 +53,13 @@ Clone the project from GitHub:
 
 If you are on Linux, execute:
 
-    $ cmake -DTHIRDPARTY=ON ..
+    $ cmake ../ -DTHIRDPARTY=ON
     $ make
     $ make install
 
 If you are on Windows, choose your version of Visual Studio:
 
-    > cmake -G "Visual Studio 14 2015 Win64" -DTHIRDPARTY=ON ..
+    > cmake ../  -G "Visual Studio 14 2015 Win64" -DTHIRDPARTY=ON
     > cmake --build . --target install
 
 If you want to compile the performance tests, you will need to add the argument `-DPERFORMANCE_TESTS=ON` when calling Cmake.
@@ -71,7 +72,7 @@ You can access the documentation online, which is hosted on [Read the Docs](http
 * [Installation manual](http://eprosima-fast-rtps.readthedocs.io/en/latest/requirements.html)
 * [User manual](http://eprosima-fast-rtps.readthedocs.io/en/latest/introduction.html)
 * [FastRTPSGen manual](http://eprosima-fast-rtps.readthedocs.io/en/latest/geninfo.html)
-* [Release notes](http://eprosima-fast-rtps.readthedocs.io/notes.html)
+* [Release notes](http://eprosima-fast-rtps.readthedocs.io/en/latest/notes.html)
 
 ## Getting Help
 

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
diff --git a/cmake/common/gtest.cmake b/cmake/common/gtest.cmake
@@ -74,15 +74,28 @@ macro(check_gmock)
     endif()
 endmacro()
 
-macro(add_gtest test)
+macro(add_gtest)
     # Parse arguments
-    set(multiValueArgs SOURCES ENVIRONMENTS DEPENDENCIES)
-    cmake_parse_arguments(GTEST "" "" "${multiValueArgs}" ${ARGN})
+    if("${ARGV0}" STREQUAL "NAME")
+        set(uniValueArgs NAME COMMAND)
+        unset(test)
+        unset(command)
+    else()
+        set(test "${ARGV0}")
+        set(command "${test}")
+    endif()
+    set(multiValueArgs SOURCES ENVIRONMENTS DEPENDENCIES LABELS)
+    cmake_parse_arguments(GTEST "" "${uniValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(GTEST_NAME)
+        set(test ${GTEST_NAME})
+        set(command ${GTEST_COMMAND})
+    endif()
 
     if(GTEST_INDIVIDUAL)
         if(WIN32)
             set(WIN_PATH "$ENV{PATH}")
-            get_target_property(LINK_LIBRARIES_ ${test} LINK_LIBRARIES)
+            get_target_property(LINK_LIBRARIES_ ${command} LINK_LIBRARIES)
             if(NOT "${LINK_LIBRARIES_}" STREQUAL "LINK_LIBRARIES_-NOTFOUND")
                 foreach(LIBRARY_LINKED ${LINK_LIBRARIES_})
                     if(TARGET ${LIBRARY_LINKED})
@@ -97,32 +110,35 @@ macro(add_gtest test)
         endif()
 
         foreach(GTEST_SOURCE_FILE ${GTEST_SOURCES})
-            file(STRINGS ${GTEST_SOURCE_FILE} GTEST_NAMES REGEX ^TEST)
-            foreach(GTEST_NAME ${GTEST_NAMES})
-                string(REGEX REPLACE ["\) \(,"] ";" GTEST_NAME ${GTEST_NAME})
-                list(GET GTEST_NAME 1 GTEST_GROUP_NAME)
-                list(GET GTEST_NAME 3 GTEST_NAME)
-                add_test(NAME ${GTEST_GROUP_NAME}.${GTEST_NAME}
-                    COMMAND ${test}
-                    --gtest_filter=${GTEST_GROUP_NAME}.${GTEST_NAME})
+            file(STRINGS ${GTEST_SOURCE_FILE} GTEST_TEST_NAMES REGEX ^TEST)
+            foreach(GTEST_TEST_NAME ${GTEST_TEST_NAMES})
+                string(REGEX REPLACE ["\) \(,"] ";" GTEST_TEST_NAME ${GTEST_TEST_NAME})
+                list(GET GTEST_TEST_NAME 1 GTEST_GROUP_NAME)
+                list(GET GTEST_TEST_NAME 3 GTEST_TEST_NAME)
+                add_test(NAME ${GTEST_GROUP_NAME}.${GTEST_TEST_NAME}
+                    COMMAND ${command} --gtest_filter=${GTEST_GROUP_NAME}.${GTEST_TEST_NAME})
 
                 # Add environment
                 if(WIN32)
-                    set_property(TEST ${GTEST_GROUP_NAME}.${GTEST_NAME} APPEND PROPERTY ENVIRONMENT "PATH=${WIN_PATH}")
+                    set_property(TEST ${GTEST_GROUP_NAME}.${GTEST_TEST_NAME} APPEND PROPERTY ENVIRONMENT "PATH=${WIN_PATH}")
                 endif()
 
                 foreach(property ${GTEST_ENVIRONMENTS})
-                    set_property(TEST ${GTEST_GROUP_NAME}.${GTEST_NAME} APPEND PROPERTY ENVIRONMENT "${property}")
+                    set_property(TEST ${GTEST_GROUP_NAME}.${GTEST_TEST_NAME} APPEND PROPERTY ENVIRONMENT "${property}")
                 endforeach()
+
+                # Add labels
+                set_property(TEST ${GTEST_GROUP_NAME}.${GTEST_TEST_NAME} PROPERTY LABELS "${GTEST_LABELS}")
+
             endforeach()
         endforeach()
     else()
-        add_test(NAME ${test} COMMAND ${test})
+        add_test(NAME ${test} COMMAND ${command})
 
         # Add environment
         if(WIN32)
             set(WIN_PATH "$ENV{PATH}")
-            get_target_property(LINK_LIBRARIES_ ${test} LINK_LIBRARIES)
+            get_target_property(LINK_LIBRARIES_ ${command} LINK_LIBRARIES)
             if(NOT "${LINK_LIBRARIES_}" STREQUAL "LINK_LIBRARIES_-NOTFOUND")
                 foreach(LIBRARY_LINKED ${LINK_LIBRARIES_})
                     if(TARGET ${LIBRARY_LINKED})
@@ -140,5 +156,8 @@ macro(add_gtest test)
         foreach(property ${GTEST_ENVIRONMENTS})
             set_property(TEST ${test} APPEND PROPERTY ENVIRONMENT "${property}")
         endforeach()
+
+        # Add labels
+        set_property(TEST ${test} PROPERTY LABELS "${GTEST_LABELS}")
     endif()
 endmacro()
diff --git a/cmake/dev/generate_msvc_libraries.cmake b/cmake/dev/generate_msvc_libraries.cmake
@@ -23,7 +23,17 @@ macro(generate_msvc_libraries platform)
     file(TO_CMAKE_PATH $ENV{EPROSIMA_OPENSSL_ROOT}/${platform} OPENSSL_ROOT_)
 
     if(IS_X64)
-        set(generator_ "${generator_} Win64")
+        if("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 16 2019")
+            set(carch_def_ "-A")
+            set(carch_arg_ "x64")
+        else()
+            set(generator_ "${generator_} Win64")
+        endif()
+    else()
+        if("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 16 2019")
+            set(carch_def_ "-A")
+            set(carch_arg_ "Win32")
+        endif()
     endif()
 
     if(IS_VS2013)
@@ -44,14 +54,14 @@ macro(generate_msvc_libraries platform)
         COMMAND ${CMAKE_COMMAND} -E make_directory "${PROJECT_BINARY_DIR}/eprosima_installer/${platform}_static")
 
     add_custom_target(${PROJECT_NAME}_${platform} ALL
-        COMMAND ${CMAKE_COMMAND} -G "${generator_}" -T "${toolset_}" -DEPROSIMA_BUILD=ON -DEPROSIMA_INSTALLER_MINION=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_} -DSECURITY=ON -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/eprosima_installer/${platform}/install ${PROJECT_SOURCE_DIR}
+        COMMAND ${CMAKE_COMMAND} -G "${generator_}" -T "${toolset_}" ${carch_def_} ${carch_arg_} -DEPROSIMA_BUILD=ON -DEPROSIMA_INSTALLER_MINION=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_} -DSECURITY=ON -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/eprosima_installer/${platform}/install ${PROJECT_SOURCE_DIR}
         COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
         COMMAND ${CMAKE_COMMAND} --build . --target install --config Debug
         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/eprosima_installer/${platform}
         )
 
     add_custom_target(${PROJECT_NAME}_${platform}_static ALL
-        COMMAND ${CMAKE_COMMAND} -G "${generator_}" -T "${toolset_}" -DBUILD_SHARED_LIBS=OFF -DEPROSIMA_BUILD=ON -DEPROSIMA_INSTALLER_MINION=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_} -DSECURITY=ON -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/eprosima_installer/${platform}/install ${PROJECT_SOURCE_DIR}
+        COMMAND ${CMAKE_COMMAND} -G "${generator_}" -T "${toolset_}" ${carch_def_} ${carch_arg_} -DBUILD_SHARED_LIBS=OFF -DEPROSIMA_BUILD=ON -DEPROSIMA_INSTALLER_MINION=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_} -DSECURITY=ON -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/eprosima_installer/${platform}/install ${PROJECT_SOURCE_DIR}
         COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
         COMMAND ${CMAKE_COMMAND} --build . --target install --config Debug
         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/eprosima_installer/${platform}_static

diff --git a/cmake/dev/java_support.cmake b/cmake/dev/java_support.cmake
@@ -12,10 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-macro(gradle_build directory)
+macro(gradle_build directory command_build)
     find_package(Java 1.6 COMPONENTS Runtime REQUIRED)
     if(WIN32)
         find_program(GRADLE_EXE NAMES gradle gradle.exe gradle.bat)
+        get_filename_component(GRADLE_EXE_EXTENSION ${GRADLE_EXE} EXT)
+        if(NOT GRADLE_EXE_EXTENSION)
+            set(GRADLE_EXE ${GRADLE_EXE}.bat)
+        endif()
     else()
         find_program(GRADLE_EXE gradle)
     endif()
@@ -29,7 +33,7 @@ macro(gradle_build directory)
 
     if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_LESS 3.1.3)
         add_custom_target(java ALL
-            COMMAND "${GRADLE_EXE}" -Pcustomversion=${PROJECT_VERSION} build
+            COMMAND "${GRADLE_EXE}" -Pcustomversion=${PROJECT_VERSION} ${command_build}
             WORKING_DIRECTORY ${directory}
             COMMENT "Generating Java application" VERBATIM)
     else()
@@ -46,7 +50,7 @@ macro(gradle_build directory)
             COMMAND ${CMAKE_COMMAND} -E env
             --unset=JAVA_HOME
             "PATH=${Java_JAVA_EXECUTABLE_DIR_NATIVE}${delimiter_}$<JOIN:$ENV{PATH},${delimiter_}>"
-            "${GRADLE_EXE}" -Pcustomversion=${PROJECT_VERSION} build
+            "${GRADLE_EXE}" -Pcustomversion=${PROJECT_VERSION} ${command_build}
             WORKING_DIRECTORY ${directory}
             COMMENT "Generating Java application" VERBATIM)
     endif()

diff --git a/configure.ac b/configure.ac
@@ -20,8 +20,8 @@
 # Define variables for the FastRTPS version number.
 #
 m4_define([version_major],[1])
-m4_define([version_minor],[7])
-m4_define([version_micro],[2])
+m4_define([version_minor],[8])
+m4_define([version_micro],[0])
 
 AC_INIT([fastrtps], [version_major.version_minor.version_micro], [support@eprosima.com], [eProsima FastRTPS], [http://eprosima.com/])
 CONFIG_ARGS="$*"
@@ -57,18 +57,25 @@ AC_C_BIGENDIAN(
   AC_MSG_ERROR(universial endianess not supported)
 )
 
+# OpenSSL
+AX_CHECK_OPENSSL(ac_openssl_found=yes,
+                 ac_openssl_found=no)
+
+AS_IF([test "$ac_openssl_found" = yes],
+     AC_DEFINE([TLS_FOUND], [1], [Defined if TLS support is enable]),
+     AC_DEFINE([TLS_FOUND], [0], [Defined if TLS support is enable]))
+
 # Security
 AC_ARG_ENABLE([security],
     AS_HELP_STRING([--enable-security], [Enables security support]),
     ac_enable_security=$enableval,
     ac_enable_security=no
     )
 AS_IF([test "$ac_enable_security" = yes],
-    [
-     AC_DEFINE([HAVE_SECURITY], [1], [Defined if security support is enable])
-     AX_CHECK_OPENSSL([AC_MSG_NOTICE([Found OpenSSL])], [AC_MSG_ERROR([Could not find OpenSSL])])
-    ],
-    [AC_DEFINE([HAVE_SECURITY], [0], [Defined if security support is enable])])
+    AS_IF([test "$ac_openssl_found" = yes],
+        AC_DEFINE([HAVE_SECURITY], [1], [Defined if security support is enable]),
+        AC_MSG_ERROR([To support security you need OpenSSL libraries])),
+    AC_DEFINE([HAVE_SECURITY], [0], [Defined if security support is enable]))
 AM_CONDITIONAL(SECURITY, test $ac_enable_security = yes)
 
 # Check for libraries used in the main build process

diff --git a/doc/README.html.in b/doc/README.html.in
@@ -1269,7 +1269,7 @@
 </ul>
 <p class="western" style="margin-bottom: 0in"><br/></p>
 <p class="western" style="margin-bottom: 0in; border-top: none; border-bottom: 1px solid #000000; border-left: none; border-right: none; padding-top: 0in; padding-bottom: 0.03in; padding-left: 0in; padding-right: 0in"><br/></p>
-<p class="western" style="margin-bottom: 0in"><font face="Arial, sans-serif" size="2" style="font-size: 11pt"><b>Copyright&copy; 2017 eProsima. All rights reserved.</b></font></p>
+<p class="western" style="margin-bottom: 0in"><font face="Arial, sans-serif" size="2" style="font-size: 11pt"><b>Copyright&copy; 2019 eProsima. All rights reserved.</b></font></p>
 <p class="western" style="margin-bottom: 0in"><font face="Arial, sans-serif" size="2" style="font-size: 11pt">This copy of <i>eProsima Fast RTPS</i> is licensed to you under the terms described in the LICENSE file included in this distribution.</font></p>
 </body>
 </html>