Skip to content

Commit 53ec582

Browse files
committed
Merge pull request #1 from mars-uoit/travis
Added Travis CI and roslaunch check.
2 parents 57edeec + 42d5d83 commit 53ec582

File tree

4 files changed

+43
-34
lines changed

4 files changed

+43
-34
lines changed

.travis.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
sudo: required
2+
dist: trusty
3+
language: generic
4+
compiler:
5+
- gcc
6+
- clang
7+
env:
8+
- CC=gcc CXX=g++
9+
- CC=clang CXX=clang++
10+
install:
11+
- export CI_ROS_DISTRO=indigo
12+
- sudo sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list'
13+
- wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
14+
- sudo apt-get update
15+
- sudo apt-get install python-rosdep -y
16+
- sudo `which rosdep` init
17+
- rosdep update
18+
- rosdep install --default-yes --from-paths . --ignore-src --rosdistro $CI_ROS_DISTRO
19+
script:
20+
- mkdir -p ~/catkin_ws/src
21+
- ln -s $TRAVIS_BUILD_DIR ~/catkin_ws/src/repo
22+
- cd ~/catkin_ws
23+
- source /opt/ros/$CI_ROS_DISTRO/setup.bash
24+
- catkin_make
25+
- catkin_make run_tests
26+
- catkin_test_results .
27+
- catkin_make install
28+
notifications:
29+
email: false

CMakeLists.txt

+5-9
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ catkin_package(
9898
include_directories(
9999
include
100100
${catkin_INCLUDE_DIRS}
101-
${Boost_INCLUDE_DIRS}
101+
${Boost_INCLUDE_DIRS}
102102
)
103103

104104
## Declare a cpp library
@@ -171,11 +171,7 @@ target_link_libraries(ursa_node
171171
## Testing ##
172172
#############
173173

174-
## Add gtest based cpp test target and link libraries
175-
# catkin_add_gtest(${PROJECT_NAME}-test test/test_ursa_driver.cpp)
176-
# if(TARGET ${PROJECT_NAME}-test)
177-
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
178-
# endif()
179-
180-
## Add folders to be run by python nosetests
181-
# catkin_add_nosetests(test)
174+
if (CATKIN_ENABLE_TESTING)
175+
find_package(roslaunch REQUIRED)
176+
roslaunch_add_file_check(launch/ursa_node.launch)
177+
endif()

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
URSAII Driver
1+
URSAII Driver [![Build Status](https://travis-ci.org/mars-uoit/URSAII-Driver.svg)](https://travis-ci.org/mars-uoit/URSAII-Driver)
22
=============
33
Version 0.1.0
44

@@ -10,15 +10,15 @@ This software will allow you to get radiation measurements in either gross count
1010

1111
###C++ Library###
1212
I tried to make the driver portion of the repo as stand-alone as possible. I exposes functions to execute any of the commands that URSA will respond to. Keep in mind though that some commands are meant to only be executed by factory personnel and setting parameters in a incorrect manner could damage the URSA or the detector head. Check out the doxygen documentation for the ursa::Interface class.
13-
13+
1414
####Note####
15-
If you are familiar with the standard software provided to operate the URSA there is a major difference between that software and this; This software will only provide you with the raw readings from URSA, if energy calibration or any other conditioning must be done you must implement it in your project.
15+
If you are familiar with the standard software provided to operate the URSA there is a major difference between that software and this; This software will only provide you with the raw readings from URSA, if energy calibration or any other conditioning must be done you must implement it in your project.
1616

1717

1818

1919
## How do I get set up? ##
2020

21-
The ROS node can be compiled in a catkin workspace and its dependencies can be installed with rosdep. The Library depends on several boost libraries and William Woodall's serial library. The Library can be compiled and installed using the Makefile (TODO).
21+
The ROS node can be compiled in a catkin workspace and its dependencies can be installed with rosdep. The Library depends on several boost libraries and William Woodall's serial library. The Library can be compiled and installed using the Makefile (TODO).
2222

2323

2424
###Contact###

package.xml

+5-21
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,25 @@
88

99
<license>MIT</license>
1010

11-
<!-- Url tags are optional, but mutiple are allowed, one per tag -->
12-
<!-- Optional attribute type can be: website, bugtracker, or repository -->
13-
<!-- Example: -->
1411
<!-- <url type="website">http://wiki.ros.org/ursa_driver</url> -->
1512

1613
<author email="[email protected]">Mike Hosmar</author>
1714

18-
19-
<!-- The *_depend tags are used to specify dependencies -->
20-
<!-- Dependencies can be catkin packages or system dependencies -->
21-
<!-- Examples: -->
22-
<!-- Use build_depend for packages you need at compile time: -->
23-
<!-- <build_depend>message_generation</build_depend> -->
24-
<!-- Use buildtool_depend for build tool packages: -->
25-
<!-- <buildtool_depend>catkin</buildtool_depend> -->
26-
<!-- Use run_depend for packages you need at runtime: -->
27-
<!-- <run_depend>message_runtime</run_depend> -->
28-
<!-- Use test_depend for packages you need only for testing: -->
29-
<!-- <test_depend>gtest</test_depend> -->
3015
<buildtool_depend>catkin</buildtool_depend>
16+
3117
<build_depend>roscpp</build_depend>
3218
<build_depend>serial</build_depend>
3319
<build_depend>std_msgs</build_depend>
3420
<build_depend>std_srvs</build_depend>
3521
<build_depend>message_generation</build_depend>
22+
<build_depend>boost</build_depend>
23+
<build_depend>roslaunch</build_depend>
24+
3625
<run_depend>roscpp</run_depend>
3726
<run_depend>serial</run_depend>
3827
<run_depend>std_msgs</run_depend>
3928
<run_depend>std_srvs</run_depend>
4029
<run_depend>message_runtime</run_depend>
30+
<run_depend>boost</run_depend>
4131

42-
43-
<!-- The export tag contains other, unspecified, tags -->
44-
<export>
45-
<!-- Other tools can request additional information be placed here -->
46-
47-
</export>
4832
</package>

0 commit comments

Comments
 (0)