Skip to content

Commit

Permalink
Merge pull request #16 from orocos-toolchain/smits-patch-1
Browse files Browse the repository at this point in the history
Preliminary merge
  • Loading branch information
Ruben Smits authored Dec 23, 2016
2 parents d19e293 + be9afaf commit 6a586aa
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 19 deletions.
16 changes: 6 additions & 10 deletions .travis → .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
language: c++

compiler:
- gcc
- clang
sudo: false

matrix:
include:
Expand All @@ -15,8 +12,6 @@ matrix:
- os: osx
osx_image: xcode8.2

#Dependencies

addons:
apt:
packages:
Expand All @@ -29,10 +24,11 @@ addons:
- omniidl
- omniorb-idl
- omniorb-nameserver
- libomniorb-dev
- 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
14 changes: 8 additions & 6 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -400,10 +402,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
Expand Down
2 changes: 1 addition & 1 deletion log4cpp
Submodule log4cpp updated 1 files
+6 −0 CMakeLists.txt
8 changes: 8 additions & 0 deletions orocos_toolchain/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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<T>::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<T>::create()` that accepts
a data source. See https://github.com/orocos-toolchain/rtt/pull/159.

Detailed Changelogs
-------------------

Expand Down
2 changes: 1 addition & 1 deletion rtt
Submodule rtt updated 109 files

0 comments on commit 6a586aa

Please sign in to comment.