Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
version: 1.0.{build}
pull_requests:
do_not_increment_build_number: true
skip_tags: true
os: Visual Studio 2015
init:
- cmd: rd /s /q %CHOCOLATEYINSTALL%
- ps: iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))
install:
- cinst cmake -y
- .\.appveyor\remove_python27_from_path.bat
- set "PATH=%PATH%;C:\Python34"
- python --version
- python -m pip install -U setuptools pip
- python -m pip install EmPy
- python -m pip install trollius
- mkdir build
- cd build
- mkdir src
- cd src
- python -c "import shutil; shutil.copytree('../..', './class_loader', ignore=shutil.ignore_patterns('build'))"
- git clone https://github.com/ros/console_bridge.git -b ros2
- git clone https://github.com/pocoproject/poco.git -b poco-1.6.1-release
- mkdir ament
- cd ament
- git clone https://github.com/ament/ament_cmake.git
- git clone https://github.com/ament/ament_package.git
- git clone https://github.com/ament/ament_tools.git
- git clone https://github.com/osrf/osrf_pycommon.git
- cd ..\..\..
- '"%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64'
- set "PATH=%PATH%;C:\Python34"
build_script:
- cd build
- python -u src\ament\ament_tools\scripts\ament.py build --build-tests
- python -u src\ament\ament_tools\scripts\ament.py test --skip-build --skip-install --only class_loader
deploy: off
22 changes: 22 additions & 0 deletions .appveyor/remove_python27_from_path.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
@echo off

call:remove_from_path path Python27

goto:eof

:remove_from_path
setlocal enabledelayedexpansion

set "_listname=%~1"
set "_substr=%~2"
set "_list=!%_listname%!"
for %%a in ("%_list:;=";"%") do (
set "thing=%%~a"
if "x!thing:%_substr%=!"=="x!thing!" (
set "newpath=!newpath!;!thing!"
)
)
(endlocal
set "%~1=%newpath%"
)
goto:eof
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build
34 changes: 34 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
sudo: required
os:
- linux
- osx
dist: trusty
# Force travis to use its minimal image with default Python settings
language: generic
env:
global:
- AMENT_WS=~/ament_ws
- AMENT_WS_SRC=${AMENT_WS}/src
install:
- make -f .travis/Makefile install_deps
script:
- mkdir -p build/src/ament
- cd build
- touch AMENT_IGNORE
# Fetch dependencies into the workspace
- cd src/ament
- git clone https://github.com/ament/ament_cmake.git
- git clone https://github.com/ament/ament_package.git
- git clone https://github.com/ament/ament_tools.git
- git clone https://github.com/osrf/osrf_pycommon.git
- git clone https://github.com/ament/gtest_vendor.git
- git clone https://github.com/ament/gmock_vendor.git
- cd ..
- git clone https://github.com/ros/console_bridge.git -b ros2
- cd ..
# Link source into workspace's source space
- ln -s $TRAVIS_BUILD_DIR ./src
# Build
- python3 -u ./src/ament/ament_tools/scripts/ament.py build --build-tests --ament-cmake-args -DPYTHON_VERSION=3 -- --end-with class_loader
# Test
- python3 -u ./src/ament/ament_tools/scripts/ament.py test --skip-build --skip-install --only class_loader
17 changes: 17 additions & 0 deletions .travis/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
all: class_loader

UNAME := $(shell uname -s)

install_deps:
ifeq ($(UNAME),Darwin)
brew update
brew outdated python3 || brew upgrade python3 || brew install python3
brew outdated poco || brew upgrade poco || brew install poco
sudo -H python3 -m pip install -U empy
else
sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list'
wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
sudo apt-get update -qq
sudo apt-get install cmake python3 python3-pip python3-empy python3-setuptools wget libpoco-dev
endif
python3 --version
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<build_depend>libconsole-bridge-dev</build_depend>
<build_depend>console_bridge</build_depend>
<build_depend>libpoco-dev</build_depend>

<exec_depend>libconsole-bridge-dev</exec_depend>
<exec_depend>console_bridge</exec_depend>
<exec_depend>libpoco-dev</exec_depend>

<test_depend>ament_cmake_gtest</test_depend>
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ ament_add_gtest(${PROJECT_NAME}_utest utest.cpp)
if(TARGET ${PROJECT_NAME}_utest)
target_include_directories(${PROJECT_NAME}_utest
PUBLIC "../include" ${console_bridge_INCLUDE_DIRS} ${Poco_INCLUDE_DIRS})
target_link_libraries(${PROJECT_NAME}_utest ${PROJECT_NAME} ${Poco_LIBRARIES})
target_link_libraries(${PROJECT_NAME}_utest ${PROJECT_NAME} ${Poco_LIBRARIES} pthread)
add_dependencies(${PROJECT_NAME}_utest ${PROJECT_NAME}_TestPlugins1 ${PROJECT_NAME}_TestPlugins2)
endif()