Merge pull request #1 from stack-of-tasks/hydro

Olivier Stasse · Olivier Stasse · commit 742ac7b9bfb8 · 2014-10-17T09:26:59.000+02:00
For merging with the master to allow make release
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "cmake"]
+	path = cmake
+	url = git@github.com:jrl-umi3218/jrl-cmakemodules.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,42 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+cmake_minimum_required(VERSION 2.8.3)
+project(dynamic_graph_bridge_msgs)
 
-set(ROS_BUILD_TYPE RelWithDebInfo)
+## LAAS cmake submodule part
+set(PROJECT_DESCRIPTION "Dynamic graph bridge msgs ")
+set(PROJECT_NAME dynamic_graph_bridge_msgs)
+set(PROJECT_URL "")
 
-rosbuild_init()
+set(CXX_DISABLE_WERROR False)
+set(CUSTOM_HEADER_DIR dynamic_graph_bridge_msgs)
+include(cmake/base.cmake)
+include(cmake/ros.cmake)
+include(cmake/GNUInstallDirs.cmake)
 
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
 
-rosbuild_genmsg()
-rosbuild_gensrv()
+SETUP_PROJECT()
+#List to make rest of code more readable
+set( MESSAGE_DEPENDENCIES std_msgs )
+
+#Declare build dependencies
+find_package(catkin REQUIRED
+COMPONENTS
+message_generation
+${MESSAGE_DEPENDENCIES} )
+
+#Add message files
+add_message_files(DIRECTORY msg FILES Matrix.msg Vector.msg)
+
+#Add service files
+add_service_files(DIRECTORY srv
+FILES
+RunCommand.srv
+RunPythonFile.srv)
+
+#And now generate the messages
+generate_messages(DEPENDENCIES ${MESSAGE_DEPENDENCIES})
+
+# Generate catkin/pkg-config import information
+catkin_package( CATKIN_DEPENDS message_runtime ${MESSAGE_DEPENDENCIES} )
+
+
+SETUP_PROJECT_FINALIZE()
diff --git a/Makefile b/Makefile
diff --git a/cmake b/cmake
@@ -0,0 +1 @@
+Subproject commit a831f5403a93b67c6cb8675625e79dd676a565f3
diff --git a/doc/Doxyfile.extra.in b/doc/Doxyfile.extra.in
@@ -0,0 +1,2 @@
+INPUT                  = @PROJECT_SOURCE_DIR@/doc
+
diff --git a/manifest.xml b/manifest.xml
diff --git a/package.xml b/package.xml
@@ -0,0 +1,28 @@
+<package>
+  <name>dynamic_graph_bridge_msgs</name>
+  <version>0.2.0</version>
+  <description>
+    Dynamic graph bridge messages and services.
+  </description>
+  <maintainer email="ostasse@laas.fr">Olivier Stasse</maintainer>
+  <author>Pierre Gergondet</author>
+  
+  <license>BSD</license>
+  <url>https://ros.org/wiki/dynamic_graph_bridge_msgs</url>
+
+  <buildtool_depend>catkin</buildtool_depend>
+
+  <build_depend>message_generation</build_depend>
+  <build_depend>roscpp</build_depend>
+  <build_depend>std_msgs</build_depend>
+
+  <run_depend>message_runtime</run_depend>
+  <run_depend>roscpp</run_depend>
+  <run_depend>rospy</run_depend>
+  <run_depend>std_msgs</run_depend>
+
+
+  <export>
+    <rosdoc config="rosdoc.yaml" />
+  </export>
+</package>
diff --git a/srv/RunCommand.srv b/srv/RunCommand.srv
@@ -1,5 +1,5 @@
 string input
 ---
 string result
-string stdout
-string stderr
+string standardoutput
+string standarderror

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "cmake"]`
	`2`	`+ path = cmake`
	`3`	`+ url = git@github.com:jrl-umi3218/jrl-cmakemodules.git`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+INPUT = @PROJECT_SOURCE_DIR@/doc`
	`2`	`+`