move rqt_pr2_dashboard to root

PR2 · Dec 17, 2012 · 3d1ce28 · 3d1ce28
1 parent 09aea65
commit 3d1ce28
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 *.pyc
+bni
+build
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,3 +15,31 @@ include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 #list(APPEND CPACK_SOURCE_IGNORE_FILES /core/experimental)
 
 rosbuild_make_distribution(0.1.7)
+
+# 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/Makefile b/Makefile
@@ -1 +1 @@
-include $(shell rospack find mk)/cmake_stack.mk
+include $(shell rospack find mk)/cmake.mk
diff --git a/rqt_pr2_dashboard/images/ic-base.svg → images/ic-base.svg b/rqt_pr2_dashboard/images/ic-base.svg → images/ic-base.svg
diff --git a/rqt_pr2_dashboard/images/ic-larm.svg → images/ic-larm.svg b/rqt_pr2_dashboard/images/ic-larm.svg → images/ic-larm.svg
diff --git a/rqt_pr2_dashboard/images/ic-rarm.svg → images/ic-rarm.svg b/rqt_pr2_dashboard/images/ic-rarm.svg → images/ic-rarm.svg
diff --git a/rqt_pr2_dashboard/mainpage.dox → mainpage.dox b/rqt_pr2_dashboard/mainpage.dox → mainpage.dox
diff --git a/rqt_pr2_dashboard/manifest.xml → manifest.xml b/rqt_pr2_dashboard/manifest.xml → manifest.xml
diff --git a/rqt_pr2_dashboard/plugin.xml → plugin.xml b/rqt_pr2_dashboard/plugin.xml → plugin.xml
diff --git a/rqt_pr2_dashboard/.gitignore b/rqt_pr2_dashboard/.gitignore
diff --git a/rqt_pr2_dashboard/CMakeLists.txt b/rqt_pr2_dashboard/CMakeLists.txt
diff --git a/rqt_pr2_dashboard/Makefile b/rqt_pr2_dashboard/Makefile
diff --git a/rqt_pr2_dashboard/scripts/rqt_pr2_dashboard → scripts/rqt_pr2_dashboard b/rqt_pr2_dashboard/scripts/rqt_pr2_dashboard → scripts/rqt_pr2_dashboard
diff --git a/...shboard/src/rqt_pr2_dashboard/__init__.py → src/rqt_pr2_dashboard/__init__.py b/...shboard/src/rqt_pr2_dashboard/__init__.py → src/rqt_pr2_dashboard/__init__.py
diff --git a/...oard/src/rqt_pr2_dashboard/pr2_battery.py → src/rqt_pr2_dashboard/pr2_battery.py b/...oard/src/rqt_pr2_dashboard/pr2_battery.py → src/rqt_pr2_dashboard/pr2_battery.py
diff --git a/...oard/src/rqt_pr2_dashboard/pr2_breaker.py → src/rqt_pr2_dashboard/pr2_breaker.py b/...oard/src/rqt_pr2_dashboard/pr2_breaker.py → src/rqt_pr2_dashboard/pr2_breaker.py
diff --git a/...rd/src/rqt_pr2_dashboard/pr2_dashboard.py → src/rqt_pr2_dashboard/pr2_dashboard.py b/...rd/src/rqt_pr2_dashboard/pr2_dashboard.py → src/rqt_pr2_dashboard/pr2_dashboard.py
diff --git a/...board/src/rqt_pr2_dashboard/pr2_motors.py → src/rqt_pr2_dashboard/pr2_motors.py b/...board/src/rqt_pr2_dashboard/pr2_motors.py → src/rqt_pr2_dashboard/pr2_motors.py
diff --git a/...oard/src/rqt_pr2_dashboard/pr2_runstop.py → src/rqt_pr2_dashboard/pr2_runstop.py b/...oard/src/rqt_pr2_dashboard/pr2_runstop.py → src/rqt_pr2_dashboard/pr2_runstop.py