cleanup of readme and such

.gitignore

@@ -0,0 +1,3 @@
+.cproject
+.project
+.settings

.travis.yml

@@ -0,0 +1,34 @@
+language:
+  - cpp
+  - python
+python:
+  - "2.7"
+compiler:
+  - gcc
+
+branches:
+  only:
+    - master
+    - develop
+
+install:
+  - sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu precise 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 python-catkin-pkg python-rosdep ros-groovy-catkin ros-hydro-catkin -qq
+  - sudo rosdep init
+  - rosdep update 
+  - mkdir -p /tmp/ws/src
+  - ln -s `pwd` /tmp/ws/src/package
+  - cd /tmp/ws
+  - rosdep install --from-paths src --ignore-src --rosdistro groovy -y
+  - rosdep install --from-paths src --ignore-src --rosdistro hydro -y
+
+script:
+  - source /opt/ros/groovy/setup.bash
+  - catkin_make
+  - catkin_make install
+  - rm -rf build/ install/ devel/
+  - source /opt/ros/hydro/setup.bash
+  - catkin_make
+  - catkin_make install

AUTHORS.md

@@ -0,0 +1,9 @@
+Original Authors
+----------------
+
+ * [Benjamin Pitzer] ([email protected])
+
+Contributors
+------------
+
+ * [Russell Toris](http://users.wpi.edu/~rctoris/) ([email protected])

CMakeLists.txt

@@ -1,59 +1,65 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(usb_cam)
-find_package(catkin 
-	REQUIRED COMPONENTS 
-		image_transport 
-		roscpp 
-		std_msgs 
-		sensor_msgs 
-        camera_info_manager)
 
+## Find catkin macros and libraries
+## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
+## is used, also find other catkin packages
+find_package(catkin REQUIRED COMPONENTS image_transport roscpp std_msgs sensor_msgs camera_info_manager)
 
-set(ROS_BUILD_TYPE Release)
-
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-
+## pkg-config libraries
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(avcodec libavcodec REQUIRED)
 pkg_check_modules(swscale libswscale REQUIRED)
 
+###################################################
+## Declare things to be passed to other projects ##
+###################################################
+
+## LIBRARIES: libraries you create in this project that dependent projects also need
+## CATKIN_DEPENDS: catkin_packages dependent projects also need
+## DEPENDS: system dependencies of this project that dependent projects also need
 catkin_package(
-	INCLUDE_DIRS include
-	CATKIN_DEPENDS
-		image_transport 
-		roscpp 
-		std_msgs 
-		sensor_msgs
-        camera_info_manager
+  INCLUDE_DIRS include
+  LIBRARIES ${PROJECT_NAME}
 )
 
+###########
+## Build ##
+###########
+
 include_directories(include
-	${catkin_INCLUDE_DIRS}
-	${avcodec_INCLUDE_DIRS}
-	${swscale_INCLUDE_DIRS}
+  ${catkin_INCLUDE_DIRS}
+  ${avcodec_INCLUDE_DIRS}
+  ${swscale_INCLUDE_DIRS}
 )
-add_library(usb_cam
-	src/usb_cam.cpp
+
+## Build the USB camera library
+add_library(${PROJECT_NAME} src/usb_cam.cpp)
+target_link_libraries(${PROJECT_NAME}
+  ${avcodec_LIBRARIES}
+  ${swscale_LIBRARIES}
+  ${catkin_LIBRARIES}
 )
-target_link_libraries(usb_cam ${avcodec_LIBRARIES} ${swscale_LIBRARIES} ${catkin_LIBRARIES})
 
-add_executable(usb_cam_node nodes/usb_cam_node.cpp)
-target_link_libraries(usb_cam_node usb_cam ${avcodec_LIBRARIES} ${swscale_LIBRARIES} ${catkin_LIBRARIES})
+## Declare a cpp executable
+add_executable(${PROJECT_NAME}_node nodes/usb_cam_node.cpp)
+target_link_libraries(${PROJECT_NAME}_node
+  ${PROJECT_NAME}
+  ${avcodec_LIBRARIES}
+  ${swscale_LIBRARIES}
+  ${catkin_LIBRARIES}
+)
 
 #############
 ## Install ##
 #############
 
 ## Mark executables and/or libraries for installation
-install(TARGETS usb_cam_node
+install(TARGETS ${PROJECT_NAME}_node ${PROJECT_NAME}
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 )
 
-install(TARGETS usb_cam
-  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-)
-
 install(DIRECTORY include/
    DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
    FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"

LICENSE

@@ -0,0 +1,31 @@
+Software License Agreement (BSD License)
+
+Copyright (c) 2014, Robert Bosch LLC.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+ * Neither the name of the Robert Bosch LLC. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -0,0 +1,13 @@
+usb_cam [![Build Status](https://api.travis-ci.org/bosch-ros-pkg/usb_cam.png)](https://travis-ci.org/bosch-ros-pkg/usb_cam)
+=======
+
+#### A ROS Driver for V4L USB Cameras
+For full documentation, see [the ROS wiki](http://ros.org/wiki/usb_cam).
+
+[Doxygen](http://docs.ros.org/indigo/api/usb_cam/html/) files can be found on the ROS wiki.
+
+### License
+usb_cam is released with a BSD license. For full terms and conditions, see the [LICENSE](LICENSE) file.
+
+### Authors
+See the [AUTHORS](AUTHORS.md) file for a full list of contributors.

mainpage.dox

@@ -0,0 +1,5 @@
+/**
+\mainpage
+
+\b usb_cam is a ROS driver for V4L USB cameras.
+*/

package.xml

@@ -1,14 +1,14 @@
 <package>
   <name>usb_cam</name>
   <version>0.1.4</version>
-  <description>A generic driver for USB camera that are supported by V4L</description>
-
-  <license>BSD</license>
+  <description>A ROS Driver for V4L USB Cameras</description>
 
   <maintainer email="[email protected]">Russell Toris</maintainer>
   <author email="[email protected]">Benjamin Pitzer</author>
 
-  <url type="website">http://www.ros.org/wiki/usb_cam</url>
+  <license>BSD</license>
+
+  <url type="website">http://wiki.ros.org/usb_cam</url>
   <url type="bugtracker">https://github.com/bosch-ros-pkg/usb_cam/issues</url>
   <url type="repository">https://github.com/bosch-ros-pkg/usb_cam</url>
 
@@ -27,8 +27,4 @@
   <run_depend>sensor_msgs</run_depend> 
   <run_depend>ffmpeg</run_depend>
   <run_depend>camera_info_manager</run_depend>
-
-  <export>
-    <cpp lflags="-L${prefix}/lib" cflags="-I${prefix}/include -I${prefix}/msg/cpp"/>
-  </export>
 </package>