Merge pull request #80 from utexas-bwi/joq/cleanup

bwi_virtour: install, test and doc fixes (#73, #78, utexas-bwi/bwi#46)
utexas-bwi · Sep 14, 2016 · a5fca22 · a5fca22
2 parents bb6855c + 5469b1e
commit a5fca22
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/bwi_virtour/CMakeLists.txt b/bwi_virtour/CMakeLists.txt
@@ -70,4 +70,11 @@ install(DIRECTORY launch/
         DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch)
 
 install(DIRECTORY scripts/
+        USE_SOURCE_PERMISSIONS
         DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+
+# Test launch scripts
+if (CATKIN_ENABLE_TESTING)
+  find_package(roslaunch REQUIRED)
+  roslaunch_add_file_check(launch)
+endif()
diff --git a/bwi_virtour/README.md b/bwi_virtour/README.md
@@ -2,8 +2,10 @@ BWI Virtour
 ===========
 
 Virtour is a public facing system for teleoperated building tours.
-On the robot: uses ROS to manage tour, stream video, and take commands.
-On the website: uses rosjs to pipe commands to the robot
+
+* Web address: http://www.cs.utexas.edu/~larg/bwi_virtour/
+* On the robot: uses ROS to manage tour, stream video, and take commands.
+* On the website: uses rosjs to pipe commands to the robot
 
 ## Features
 

diff --git a/bwi_virtour/package.xml b/bwi_virtour/package.xml
@@ -25,6 +25,7 @@
   <depend>roscpp</depend>
   <depend>std_msgs</depend>
 
+  <exec_depend>bwi_services</exec_depend>
   <exec_depend>message_runtime</exec_depend>
   <exec_depend>rosbridge_server</exec_depend>
   <exec_depend>web_video_server</exec_depend>