[Highly breaking change] restructuring in preparation for catkinizati…

…on. segway_rmp_demos was defunct, and has been removed. The single remaining package segway_rmpX has been promoted to the main stack segway_rmp. To use the old setup use the rosbuild branch instead.
piyushk · May 2, 2013 · 9ebae97 · 9ebae97
1 parent 9abd884
commit 9ebae97
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 138 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,17 +1,30 @@
 cmake_minimum_required(VERSION 2.4.6)
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 
-# Append to CPACK_SOURCE_IGNORE_FILES a semicolon-separated list of
-# directories (or patterns, but directories should suffice) that should
-# be excluded from the distro.  This is not the place to put things that
-# should be ignored everywhere, like "build" directories; that happens in
-# rosbuild/rosbuild.cmake.  Here should be listed packages that aren't
-# ready for inclusion in a distro.
-#
-# This list is combined with the list in rosbuild/rosbuild.cmake.  Note
-# that CMake 2.6 may be required to ensure that the two lists are combined
-# properly.  CMake 2.4 seems to have unpredictable scoping rules for such
-# variables.
-#list(APPEND CPACK_SOURCE_IGNORE_FILES /core/experimental)
+# Set the build type.  Options are:
+#  Coverage       : w/ debug symbols, w/o optimization, w/ code-coverage
+#  Debug          : w/ debug symbols, w/o optimization
+#  Release        : w/o debug symbols, w/ optimization
+#  RelWithDebInfo : w/ debug symbols, w/ optimization
+#  MinSizeRel     : w/o debug symbols, w/ optimization, stripped binaries
+#set(ROS_BUILD_TYPE RelWithDebInfo)
 
-rosbuild_make_distribution(0.1.0)
+rosbuild_init()
+
+#set the default path for built executables to the "bin" directory
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+#set the default path for built libraries to the "lib" directory
+set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+
+#uncomment if you have defined messages
+rosbuild_genmsg()
+#uncomment if you have defined services
+#rosbuild_gensrv()
+
+#common commands for building c++ executables and libraries
+#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
+#target_link_libraries(${PROJECT_NAME} another_library)
+rosbuild_add_boost_directories()
+rosbuild_add_executable(segway_rmp_node src/segway_rmp_node.cpp)
+rosbuild_link_boost(segway_rmp_node system thread)
+#target_link_libraries(example ${PROJECT_NAME})
diff --git a/Makefile b/Makefile
@@ -1 +1 @@
-include $(shell rospack find mk)/cmake_stack.mk
+include $(shell rospack find mk)/cmake.mk
diff --git a/segway_rmpX/launch/segway_rmp.launch → launch/segway_rmp.launch b/segway_rmpX/launch/segway_rmp.launch → launch/segway_rmp.launch
@@ -1,5 +1,5 @@
 <launch>
-    <node name="segway_rmp_node" pkg="segway_rmpX" type="segway_rmp_node" output="screen" required="true">
+    <node name="segway_rmp_node" pkg="segway_rmp" type="segway_rmp_node" output="screen" required="true">
         <!-- If you want to do Serial -->
         <!-- <param name="interface_type" type="str" value="serial" /> -->
         <!-- <param name="serial_port" type="str" value="/dev/ttyUSB0" /> -->

diff --git a/segway_rmpX/mainpage.dox → mainpage.dox b/segway_rmpX/mainpage.dox → mainpage.dox
diff --git a/segway_rmpX/manifest.xml → manifest.xml b/segway_rmpX/manifest.xml → manifest.xml
diff --git a/segway_rmpX/msg/.gitignore → msg/.gitignore b/segway_rmpX/msg/.gitignore → msg/.gitignore
diff --git a/segway_rmpX/msg/SegwayStatus.msg → msg/SegwayStatus.msg b/segway_rmpX/msg/SegwayStatus.msg → msg/SegwayStatus.msg
diff --git a/segway_rmpX/msg/SegwayStatusStamped.msg → msg/SegwayStatusStamped.msg b/segway_rmpX/msg/SegwayStatusStamped.msg → msg/SegwayStatusStamped.msg
diff --git a/segway_rmpX/CMakeLists.txt b/segway_rmpX/CMakeLists.txt
diff --git a/segway_rmpX/Makefile b/segway_rmpX/Makefile
diff --git a/segway_rmp_demos/CMakeLists.txt b/segway_rmp_demos/CMakeLists.txt
diff --git a/segway_rmp_demos/Makefile b/segway_rmp_demos/Makefile
diff --git a/segway_rmp_demos/launch/segway_teleop.launch b/segway_rmp_demos/launch/segway_teleop.launch
diff --git a/segway_rmp_demos/mainpage.dox b/segway_rmp_demos/mainpage.dox
diff --git a/segway_rmp_demos/manifest.xml b/segway_rmp_demos/manifest.xml
diff --git a/segway_rmpX/src/.gitignore → src/.gitignore b/segway_rmpX/src/.gitignore → src/.gitignore
diff --git a/segway_rmpX/src/segway_rmp_node.cpp → src/segway_rmp_node.cpp b/segway_rmpX/src/segway_rmp_node.cpp → src/segway_rmp_node.cpp
diff --git a/stack.xml b/stack.xml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include $(shell rospack find mk)/cmake_stack.mk
		include $(shell rospack find mk)/cmake.mk