From 196677ef8183045dcb6296c6605e873b5d1252fe Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 10 Aug 2016 14:24:16 +0200 Subject: [PATCH 01/10] changelog: added section for API changes --- orocos_toolchain/CHANGELOG.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/orocos_toolchain/CHANGELOG.rst b/orocos_toolchain/CHANGELOG.rst index cda7b6d..6072f06 100644 --- a/orocos_toolchain/CHANGELOG.rst +++ b/orocos_toolchain/CHANGELOG.rst @@ -82,6 +82,14 @@ Improvements due to the improvement of the introspection+discovery. See https://github.com/orocos-toolchain/rtt/pull/123 for all details. +Other API changes +----------------- + +* The method `RTT::Property::copy()` introduced in version 2.7 + to fix a memory leak in class `PropertyBag` has been removed in + favor of an overload of `RTT::Property::create()` that accepts + a data source. See https://github.com/orocos-toolchain/rtt/pull/159. + Detailed Changelogs ------------------- From 7dbe9cfcfcc595a8da51ec71219c34b3cd9f97f3 Mon Sep 17 00:00:00 2001 From: Ruben Smits Date: Thu, 22 Dec 2016 10:08:11 +0100 Subject: [PATCH 02/10] Remove comments --- .travis | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis b/.travis index 534be8d..0ce3e41 100644 --- a/.travis +++ b/.travis @@ -15,8 +15,6 @@ matrix: - os: osx osx_image: xcode8.2 -#Dependencies - addons: apt: packages: From 19cb9d61a7ab9b81c3adbb8a57494dd71c6c3c0d Mon Sep 17 00:00:00 2001 From: Ruben Smits Date: Thu, 22 Dec 2016 10:09:58 +0100 Subject: [PATCH 03/10] Fix travis file extension --- .travis => .travis.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .travis => .travis.yml (100%) diff --git a/.travis b/.travis.yml similarity index 100% rename from .travis rename to .travis.yml From 247da51016e80931cb004f7729d4dd682bd7b8f3 Mon Sep 17 00:00:00 2001 From: Ruben Smits Date: Thu, 22 Dec 2016 10:21:04 +0100 Subject: [PATCH 04/10] Fix apt dependency --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ce3e41..e0afce4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ addons: - omniidl - omniorb-idl - omniorb-nameserver - - libomniorb-dev + - libomniorb4-dev before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi From fea9f3dd208fb187ff86b65dc2852ccb2f961b9c Mon Sep 17 00:00:00 2001 From: Ruben Smits Date: Thu, 22 Dec 2016 11:05:33 +0100 Subject: [PATCH 05/10] Change prefix to a writable place and enable all features --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0afce4..cf91539 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,8 @@ addons: - libomniorb4-dev before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install boost cmake omniorb ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install boost cmake omniorb ; fi -script: ./install.sh +script: + - ./install.sh --prefix $HOME/install --enable-tests --enable-corba --enable-mqueue From 31bed06b11b9d16faf52bf171e19f82263aded65 Mon Sep 17 00:00:00 2001 From: Ruben Smits Date: Thu, 22 Dec 2016 11:14:04 +0100 Subject: [PATCH 06/10] Remove compiler matrix as it doesn't work properly --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf91539..fec8374 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ language: c++ -compiler: - - gcc - - clang - matrix: include: - os: linux From 232c02e9cf2c87a02fee10bd12dd8128db906b57 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 22 Dec 2016 11:42:57 +0100 Subject: [PATCH 07/10] Updated submodules for branch toolchain-2.9 --- log4cpp | 2 +- ocl | 2 +- rtt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/log4cpp b/log4cpp index 41314bd..18b189e 160000 --- a/log4cpp +++ b/log4cpp @@ -1 +1 @@ -Subproject commit 41314bd9786bdac93c43a324d585b19417f4c591 +Subproject commit 18b189e1d18478ec9e6c82b868b31165bc70bb87 diff --git a/ocl b/ocl index d84366d..7eeffbd 160000 --- a/ocl +++ b/ocl @@ -1 +1 @@ -Subproject commit d84366d0cea5f402a7c28b333b52f225f6acbab2 +Subproject commit 7eeffbda60234d22a730621cd2a0d2dbf2b235ab diff --git a/rtt b/rtt index a806ffb..ccf0c46 160000 --- a/rtt +++ b/rtt @@ -1 +1 @@ -Subproject commit a806ffb126372b3a51a6f4510cc65537e9dccced +Subproject commit ccf0c46eef6c82b08d0c35aae8cc150a29bd1446 From 94115f8de718f4be435e02f98e6ec4d24e7aec75 Mon Sep 17 00:00:00 2001 From: Ruben Smits Date: Thu, 22 Dec 2016 12:28:09 +0100 Subject: [PATCH 08/10] Only use containerized builds --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fec8374..2b8a173 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: c++ +sudo: false matrix: include: From d7447119590f747ff8a3e874345a2d8e256c139d Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 22 Dec 2016 12:40:40 +0100 Subject: [PATCH 09/10] Fix readlink -f on MacOS X --- install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index b911fdb..238493c 100755 --- a/install.sh +++ b/install.sh @@ -10,10 +10,10 @@ DEFAULT_PREFIX=/usr/local : ${PREFIX:=$DEFAULT_PREFIX} if [ -e .git ]; then # build in-source - DEFAULT_SOURCES=`readlink -fm .` + DEFAULT_SOURCES=`readlink -fm . 2>/dev/null || readlink . || echo .` else # build out of source - DEFAULT_SOURCES=`readlink -fm src/orocos-toolchain` + DEFAULT_SOURCES=`readlink -fm src/orocos-toolchain 2>/dev/null || readlink src/orocos-toolchain || echo src/orocos-toolchain` fi : ${SOURCES:=$DEFAULT_SOURCES} DEFAULT_GIT_BASE_URL=https://github.com/orocos-toolchain/ @@ -400,10 +400,10 @@ while true; do NO_DEPS=true shift ;; --prefix) - PREFIX=`readlink -fm "$2"` + PREFIX=`readlink -fm "$2" 2>/dev/null || readlink "$2" || echo "$2"` shift 2 ;; -s|--source) - SOURCES=`readlink -fm "$2"` + SOURCES=`readlink -fm "$2" 2>/dev/null || readlink "$2" || echo "$2"` shift 2 ;; -c|--clean) CLEAN=true From be9afaf1073070a368e48eb3a12459ae5e0d74d3 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 23 Dec 2016 11:10:32 +0100 Subject: [PATCH 10/10] install.sh: do not call lsb_release on non-Linux platforms --- install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 238493c..5e979a8 100755 --- a/install.sh +++ b/install.sh @@ -320,8 +320,10 @@ function is_feature_disabled() # Detect platform settings # ############################################################################## PLATFORM=`uname -s || true` -LINUX_DISTRO=`lsb_release -si` -LINUX_CODENAME=`lsb_release -sc` +if [ "$PLATFORM" = "Linux" ]; then + LINUX_DISTRO=`lsb_release -si || true` + LINUX_CODENAME=`lsb_release -sc || true` +fi # ############################################################################## # Parse command line options