Merge branch 'yarp-3.3'

.appveyor.yml

@@ -128,7 +128,7 @@ install:
   #- cmd: del "%JPEG_DEFAULT_ROOT%\*.exe" /S /F /Q
 
 before_build:
-  - cmd: cmake -H%APPVEYOR_BUILD_FOLDER% -B%APPVEYOR_BUILD_FOLDER%\build -G"%CMAKE_GENERATOR%" -A%CMAKE_PLATFORM% -DCMAKE_INSTALL_PREFIX:PATH=%APPVEYOR_BUILD_FOLDER%\install -C%APPVEYOR_BUILD_FOLDER%\scripts\admin\initial-cache.cmake
+  - cmd: cmake -H%APPVEYOR_BUILD_FOLDER% -B%APPVEYOR_BUILD_FOLDER%\build -G"%CMAKE_GENERATOR%" -A%CMAKE_PLATFORM% -DCMAKE_INSTALL_PREFIX:PATH=%APPVEYOR_BUILD_FOLDER%\install -C%APPVEYOR_BUILD_FOLDER%\.ci\initial-cache.appveyor.cmake
 
 build:
   project: build\yarp.sln

.ci/initial-cache.travis.cmake

@@ -0,0 +1,24 @@
+# Copyright (C) 2006-2020 Istituto Italiano di Tecnologia (IIT)
+# All rights reserved.
+#
+# This software may be modified and distributed under the terms of the
+# BSD-3-Clause license. See the accompanying LICENSE file for details.
+
+set(CMAKE_SKIP_INSTALL_RPATH ON CACHE BOOL "")
+set(YARP_COMPILE_TESTS ON CACHE BOOL "")
+set(YARP_COMPILE_GUIS ON CACHE BOOL "")
+set(YARP_COMPILE_yarpviz ON CACHE BOOL "")
+set(YARP_COMPILE_libYARP_math ON CACHE BOOL "")
+set(ENABLE_yarpcar_human ON CACHE BOOL "")
+set(ENABLE_yarpcar_depthimage ON CACHE BOOL "")
+# set(ENABLE_yarpcar_mjpeg ON CACHE BOOL "")
+set(ENABLE_yarpmod_fakebot ON CACHE BOOL "")
+set(ENABLE_yarpmod_fakeMotionControl ON CACHE BOOL "")
+set(ENABLE_yarpmod_fakeAnalogSensor ON CACHE BOOL "")
+set(ENABLE_yarpmod_fakeIMU ON CACHE BOOL "")
+set(ENABLE_yarpmod_SerialServoBoard ON CACHE BOOL "")
+set(ENABLE_yarpmod_serialport ON CACHE BOOL "")
+set(ENABLE_yarpmod_imuBosch_BNO055 ON CACHE BOOL "")
+set(ENABLE_yarpmod_fakeLaser ON CACHE BOOL "")
+set(ENABLE_yarpmod_rpLidar ON CACHE BOOL "")
+set(ENABLE_yarpmod_laserHokuyo ON CACHE BOOL "")

.travis.yml

@@ -89,9 +89,8 @@ git:
 
 .export_cmake_options_base_cmd_definition: &export_cmake_options_base_cmd |-
   # Prepare cmake options
-  . scripts/admin/generate-cmake-options.sh $(hostname) $(lsb_release -cs) continuous
   export YARP_INSTALL_PREFIX="${PWD}/install"
-  export YARP_CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX=${YARP_INSTALL_PREFIX}"
+  export YARP_CMAKE_OPTIONS="${CMAKE_OPTIONS} -C${PWD}/.ci/initial-cache.appveyor.cmake -DCMAKE_INSTALL_PREFIX=${YARP_INSTALL_PREFIX}"
 
 .export_cmake_options_linux_cmd_definition: &export_cmake_options_linux_cmd |-
   # export_cmake_options_linux_cmd

COPYING

@@ -174,7 +174,7 @@ The list of committers in the YARP repository (ordered by number of commit) is:
 
 The list of copyright holders for YARP is:
   Copyright (C) 1995, 2000, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020
-    Istituto Italiano di Tecnologia (IIT) (2206 files)
+    Istituto Italiano di Tecnologia (IIT) (2207 files)
     RobotCub Consortium (733 files)
     Daniel Krieg <[email protected]> (16 files)
     David Miller <[email protected]> (13 files)

README.md

@@ -82,8 +82,6 @@ CI Status
 [![Build Status (Linux/macOS)](https://img.shields.io/travis/robotology/yarp/master.svg?logo=travis&label=build%20(Linux/macOS))](https://travis-ci.org/robotology/yarp)
 [![Build status (Windows)](https://img.shields.io/appveyor/ci/robotology/yarp/master.svg?logo=appveyor&label=build%20(Windows))](https://ci.appveyor.com/project/robotology/yarp)
 
-and [more](http://dashboard.icub.org/index.php?project=YARP)
-
 
 Stats
 -----

cmake/YarpOptions.cmake

@@ -279,31 +279,16 @@ if(YARP_EXPERIMENTAL_HARDENING)
 endif()
 
 
-#########################################################################
-# Control compilation of device tests.
-# Not really for end-user, but instead for the library developers
-yarp_deprecated_option(CREATE_BUILTIN_DEVICE_TESTS) # Since YARP 2.3.68
-
-
-#########################################################################
-# Control submission of reports
-option(ENABLE_DASHBOARD_SUBMIT "Allow submission of builds to http://dashboard.icub.org/index.php?project=YARP" OFF)
-mark_as_advanced(ENABLE_DASHBOARD_SUBMIT)
-if(ENABLE_DASHBOARD_SUBMIT)
-  include(CTest)
-endif()
-
-
 #########################################################################
 # Control setting an rpath
-yarp_deprecated_option(ENABLE_FORCE_RPATH)
-yarp_deprecated_option(INSTALL_WITH_RPATH)
+
 add_install_rpath_support(LIB_DIRS "${CMAKE_INSTALL_FULL_LIBDIR}"       # Libraries
                           BIN_DIRS "${CMAKE_INSTALL_FULL_BINDIR}"       # Binaries
                                    "${CMAKE_INSTALL_FULL_LIBDIR}/yarp"  # Plugins
                           INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}"
                           USE_LINK_PATH)
 
+
 #########################################################################
 # Specify yarp version and copyright into macOS bundles
 set(MACOSX_BUNDLE_COPYRIGHT "© 2006-2020 Istituto Italiano di Tecnologia (IIT), 2006-2010 RobotCub Consortium. YARP is released under the terms of the BSD-3-Clause. See the accompanying LICENSE file for details.")
@@ -339,17 +324,15 @@ endif()
 
 
 #########################################################################
-# Display test machine options for reference, if they are set
-
-if(TEST_MACHINE_HOSTNAME)
-  message(STATUS "TEST_MACHINE_HOSTNAME: ${TEST_MACHINE_HOSTNAME}")
-  message(STATUS "TEST_MACHINE_OS_TYPE: ${TEST_MACHINE_OS_TYPE}")
-  message(STATUS "TEST_MACHINE_TEST_TYPE: ${TEST_MACHINE_TEST_TYPE}")
-endif()
-
-
-
+# Deprecated options
 
+yarp_deprecated_option(ENABLE_FORCE_RPATH) # Since YARP 2.3.65
+yarp_deprecated_option(INSTALL_WITH_RPATH) # Since YARP 2.3.65
+yarp_deprecated_option(CREATE_BUILTIN_DEVICE_TESTS) # Since YARP 2.3.68
 yarp_deprecated_option(YARP_EXPERIMENTAL_CXX11) # Since YARP 3.0.0
 yarp_deprecated_option(YARP_WRAP_STL_STRING) # Since YARP 3.0.0
 yarp_deprecated_option(YARP_WRAP_STL_STRING_INLINE) # Since YARP 3.0.0
+yarp_deprecated_option(ENABLE_DASHBOARD_SUBMIT) # Since YARP 3.3.3
+yarp_deprecated_option(TEST_MACHINE_HOSTNAME) # Since YARP 3.3.3
+yarp_deprecated_option(TEST_MACHINE_OS_TYPE) # Since YARP 3.3.3
+yarp_deprecated_option(TEST_MACHINE_TEST_TYPE) # Since YARP 3.3.3

doc/release/yarp_3_3/fix_thrift_crosscompiling.md

@@ -0,0 +1,6 @@
+fix_thrift_crosscompiling {yarp-3.3}
+-------------------------
+
+### Build System
+
+* Bison and flex are no longer run when crosscompiling.

scripts/admin/update-license

@@ -23,7 +23,6 @@ for f in `cd license_check; find . -type f -iname "*.cpp" \
                                        -or -name "CMakeLists.txt" \
                 | grep -v "/extern" \
                 | grep -v "/qtquick2applicationviewer/" \
-                | grep -v "CTestConfig.cmake" \
                 | grep -v "src/carriers/portmonitor_carrier/lua/lua_swig.h" \
 `; do
     ./scripts/admin/update-license-single $f

src/idls/thrift/CMakeLists.txt

@@ -24,7 +24,7 @@ set(yarpidl_thrift_SRCS "${CMAKE_CURRENT_BINARY_DIR}/thrift/version.h"
 set(yarpidl_thrift_YARP_SRCS src/t_yarp_generator.cc)
 
 
-if(YARP_HAS_BISON AND YARP_HAS_FLEX)
+if(YARP_HAS_BISON AND YARP_HAS_FLEX AND NOT CMAKE_CROSS_COMPILING)
   bison_target(thrifty
                "${THRIFT_ROOT}/compiler/cpp/src/thrift/thrifty.yy"
                "${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.cc"