Skip to content

Commit

Permalink
Merge pull request start-jsk#723 from start-jsk/add_eusdoc
Browse files Browse the repository at this point in the history
[.travis.yaml, hrpsys_ros_bridge/catkin.cmake] add eusdoc
  • Loading branch information
k-okada committed May 12, 2015
2 parents c8b9274 + 5a58d3d commit 064310d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ env:
- CATKIN_PARALLEL_JOBS='-p2'
- CATKIN_PARALLEL_TEST_JOBS='-p1'
- ROS_PARALLEL_TEST_JOBS='-j1'
- secure: "QxLoOR83QHxGdMJ3BJ0TwRJdezWZaiWfoe4O88XMSG8LFMZLRbqNmOsrLn9b/VgMQpz44CP7tXXQvNz0FDRSTpgSdyNT+p1UA7iEhFYI4G3OEsYf0r6/4rjvtM7FCoIsBiPYBwofVAUP+U9d8Scjn+2+xjjKwOpEbaE/yc+zwrc="
matrix:
- ROS_DISTRO=hydro USE_DEB=true
- ROS_DISTRO=hydro USE_DEB=false NOT_TEST_INSTALL=true
Expand All @@ -24,6 +25,7 @@ env:
- ROS_DISTRO=indigo USE_DEB=true
- TEST_TYPE=work_with_downstream TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=hydro EXTRA_DEB="ros-hydro-roslint ros-hydro-robot-pose-ekf"
- TEST_TYPE=work_with_315_1_10 TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=hydro EXTRA_DEB=ros-hydro-roslint
- ROS_DISTRO=hydro USE_DEB=true EXTRA_DEB="ros-hydro-pr2eus"
matrix:
allow_failures:
- env: ROS_DISTRO=indigo USE_DEB=true
Expand All @@ -42,3 +44,6 @@ before_script:
script:
- export ROS_PARALLEL_JOBS="-j2 -l2"
- if [ "${TEST_TYPE}" == "" ] ; then source .travis/travis.sh; else source ./.travis_test.sh ; fi
after_success:
- TRAVIS_JOB_SUBNUMBER="${TRAVIS_JOB_NUMBER##*.}"
- if [ "$TRAVIS_JOB_SUBNUMBER" == 8 -a "$TRAVIS_BRANCH" == "master" ]; then ${CI_SOURCE_PATH}/.travis/upload-docs.sh; fi
5 changes: 5 additions & 0 deletions hrpsys_ros_bridge/catkin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,8 @@ add_rostest(test/test-samplerobot.test)
add_rostest(test/test-pa10.test)
add_rostest(test/test-import-python.test)

# call catkin depends
find_package(catkin COMPONENTS roseus QUIET)
if(roseus_FOUND)
generate_eusdoc(euslisp/rtm-ros-robot-interface.l)
endif()

0 comments on commit 064310d

Please sign in to comment.