From 9ebae97dab57c559c4d1470f11ebe46b3f59a117 Mon Sep 17 00:00:00 2001 From: piyushk Date: Thu, 2 May 2013 17:50:51 -0500 Subject: [PATCH] [Highly breaking change] restructuring in preparation for catkinization. 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. --- CMakeLists.txt | 39 ++++++++++++------- Makefile | 2 +- .../launch => launch}/segway_rmp.launch | 2 +- segway_rmpX/mainpage.dox => mainpage.dox | 0 segway_rmpX/manifest.xml => manifest.xml | 0 {segway_rmpX/msg => msg}/.gitignore | 0 {segway_rmpX/msg => msg}/SegwayStatus.msg | 0 .../msg => msg}/SegwayStatusStamped.msg | 0 segway_rmpX/CMakeLists.txt | 30 -------------- segway_rmpX/Makefile | 1 - segway_rmp_demos/CMakeLists.txt | 30 -------------- segway_rmp_demos/Makefile | 1 - segway_rmp_demos/launch/segway_teleop.launch | 10 ----- segway_rmp_demos/mainpage.dox | 26 ------------- segway_rmp_demos/manifest.xml | 16 -------- {segway_rmpX/src => src}/.gitignore | 0 {segway_rmpX/src => src}/segway_rmp_node.cpp | 0 stack.xml | 9 ----- 18 files changed, 28 insertions(+), 138 deletions(-) rename {segway_rmpX/launch => launch}/segway_rmp.launch (96%) rename segway_rmpX/mainpage.dox => mainpage.dox (100%) rename segway_rmpX/manifest.xml => manifest.xml (100%) rename {segway_rmpX/msg => msg}/.gitignore (100%) rename {segway_rmpX/msg => msg}/SegwayStatus.msg (100%) rename {segway_rmpX/msg => msg}/SegwayStatusStamped.msg (100%) delete mode 100644 segway_rmpX/CMakeLists.txt delete mode 100644 segway_rmpX/Makefile delete mode 100644 segway_rmp_demos/CMakeLists.txt delete mode 100644 segway_rmp_demos/Makefile delete mode 100644 segway_rmp_demos/launch/segway_teleop.launch delete mode 100644 segway_rmp_demos/mainpage.dox delete mode 100644 segway_rmp_demos/manifest.xml rename {segway_rmpX/src => src}/.gitignore (100%) rename {segway_rmpX/src => src}/segway_rmp_node.cpp (100%) delete mode 100644 stack.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 28105dd..cf50b35 100644 --- 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 index a818cca..b75b928 100644 --- a/Makefile +++ b/Makefile @@ -1 +1 @@ -include $(shell rospack find mk)/cmake_stack.mk \ No newline at end of file +include $(shell rospack find mk)/cmake.mk \ No newline at end of file diff --git a/segway_rmpX/launch/segway_rmp.launch b/launch/segway_rmp.launch similarity index 96% rename from segway_rmpX/launch/segway_rmp.launch rename to launch/segway_rmp.launch index 75e9780..8d749b4 100755 --- a/segway_rmpX/launch/segway_rmp.launch +++ b/launch/segway_rmp.launch @@ -1,5 +1,5 @@ - + diff --git a/segway_rmpX/mainpage.dox b/mainpage.dox similarity index 100% rename from segway_rmpX/mainpage.dox rename to mainpage.dox diff --git a/segway_rmpX/manifest.xml b/manifest.xml similarity index 100% rename from segway_rmpX/manifest.xml rename to manifest.xml diff --git a/segway_rmpX/msg/.gitignore b/msg/.gitignore similarity index 100% rename from segway_rmpX/msg/.gitignore rename to msg/.gitignore diff --git a/segway_rmpX/msg/SegwayStatus.msg b/msg/SegwayStatus.msg similarity index 100% rename from segway_rmpX/msg/SegwayStatus.msg rename to msg/SegwayStatus.msg diff --git a/segway_rmpX/msg/SegwayStatusStamped.msg b/msg/SegwayStatusStamped.msg similarity index 100% rename from segway_rmpX/msg/SegwayStatusStamped.msg rename to msg/SegwayStatusStamped.msg diff --git a/segway_rmpX/CMakeLists.txt b/segway_rmpX/CMakeLists.txt deleted file mode 100644 index cf50b35..0000000 --- a/segway_rmpX/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -cmake_minimum_required(VERSION 2.4.6) -include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) - -# 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_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/segway_rmpX/Makefile b/segway_rmpX/Makefile deleted file mode 100644 index b75b928..0000000 --- a/segway_rmpX/Makefile +++ /dev/null @@ -1 +0,0 @@ -include $(shell rospack find mk)/cmake.mk \ No newline at end of file diff --git a/segway_rmp_demos/CMakeLists.txt b/segway_rmp_demos/CMakeLists.txt deleted file mode 100644 index f8f1c9c..0000000 --- a/segway_rmp_demos/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -cmake_minimum_required(VERSION 2.4.6) -include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) - -# 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_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_link_boost(${PROJECT_NAME} thread) -#rosbuild_add_executable(example examples/example.cpp) -#target_link_libraries(example ${PROJECT_NAME}) diff --git a/segway_rmp_demos/Makefile b/segway_rmp_demos/Makefile deleted file mode 100644 index b75b928..0000000 --- a/segway_rmp_demos/Makefile +++ /dev/null @@ -1 +0,0 @@ -include $(shell rospack find mk)/cmake.mk \ No newline at end of file diff --git a/segway_rmp_demos/launch/segway_teleop.launch b/segway_rmp_demos/launch/segway_teleop.launch deleted file mode 100644 index 613cfe4..0000000 --- a/segway_rmp_demos/launch/segway_teleop.launch +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/segway_rmp_demos/mainpage.dox b/segway_rmp_demos/mainpage.dox deleted file mode 100644 index af6bf35..0000000 --- a/segway_rmp_demos/mainpage.dox +++ /dev/null @@ -1,26 +0,0 @@ -/** -\mainpage -\htmlinclude manifest.html - -\b segway_rmp200_demos is ... - - - - -\section codeapi Code API - - - - -*/ diff --git a/segway_rmp_demos/manifest.xml b/segway_rmp_demos/manifest.xml deleted file mode 100644 index 1156f21..0000000 --- a/segway_rmp_demos/manifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - segway_rmp200_demos - - - William Woodall - BSD - - http://ros.org/wiki/segway_rmp200_demos - - - - - - diff --git a/segway_rmpX/src/.gitignore b/src/.gitignore similarity index 100% rename from segway_rmpX/src/.gitignore rename to src/.gitignore diff --git a/segway_rmpX/src/segway_rmp_node.cpp b/src/segway_rmp_node.cpp similarity index 100% rename from segway_rmpX/src/segway_rmp_node.cpp rename to src/segway_rmp_node.cpp diff --git a/stack.xml b/stack.xml deleted file mode 100644 index 61f314f..0000000 --- a/stack.xml +++ /dev/null @@ -1,9 +0,0 @@ - - segway_rmp - Maintained by William Woodall - BSD - - http://ros.org/wiki/segway_rmp - - -