From 4b81a58658510aef83ce071ded8235ea35d01211 Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Wed, 11 Apr 2018 14:45:48 +0200
Subject: [PATCH] Update package.xml [travis] Update sequence of docker cmds

---
 .travis.yml |  8 ++++----
 package.xml | 47 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ce28981..3816a94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,9 @@ services:
 before_install:
 - docker build -t dyngb-trusty -f ./travis_custom/Dockerfile .
 - docker run -t -d --name dyngb-trusty-test dyngb-trusty
-- docker exec dyngb-trusty-test sudo git clone --recursive https://github.com/stack-of-tasks/dynamic_graph_bridge.git /repo
+- docker exec dyngb-trusty-test sudo mkdir -p /catkin_ws_dyngb/src
+- docker exec dyngb-trusty-test sudo sh -c "cd /catkin_ws_dyngb/src;. /opt/ros/indigo/setup.sh;catkin_init_workspace"
+- docker exec dyngb-trusty-test sudo git clone --recursive https://github.com/stack-of-tasks/dynamic_graph_bridge.git /catkin_ws_dyngb/src/dynamic_graph_bridge
 
 script:
-- docker exec dyngb-trusty-test sudo mkdir /build
-- docker exec dyngb-trusty-test sudo sh -c "cd /build;cmake ../repo"
-- docker exec dyngb-trusty-test sudo sh -c "cd /build;make"
+- docker exec dyngb-trusty-test sudo sh -c "cd /catkin_ws_dyngb;. /opt/ros/indigo/setup.sh;catkin_make"
diff --git a/package.xml b/package.xml
index 5e793f3..0dfcefc 100644
--- a/package.xml
+++ b/package.xml
@@ -18,19 +18,36 @@
 
   <buildtool_depend>catkin</buildtool_depend> 
 
-  <depend>std_msgs</depend>
-  <depend>std_srvs</depend>
-  <depend>roscpp</depend>
-  <depend>geometry_msgs</depend>
-  <depend>sensor_msgs</depend>
-  <depend>tf</depend>
-  <depend>realtime_tools</depend>
-  <depend>message_generation</depend>
-  <depend>message_runtime</depend>
-  <depend>tf2_bullet</depend>
-  <depend>dynamic-graph</depend>
-  <depend>dynamic-graph-python</depend>
-  <depend>sot-core</depend>
-  <depend>sot-dynamic-pinocchio</depend>
-  <depend>dynamic_graph_bridge_msgs</depend>
+  <build_depend>std_msgs</build_depend>
+  <build_depend>std_srvs</build_depend>
+  <build_depend>roscpp</build_depend>
+  <build_depend>geometry_msgs</build_depend>
+  <build_depend>sensor_msgs</build_depend>
+  <build_depend>tf</build_depend>
+  <build_depend>realtime_tools</build_depend>
+  <build_depend>message_generation</build_depend>
+  <build_depend>message_runtime</build_depend>
+  <build_depend>tf2_bullet</build_depend>
+  <build_depend>dynamic-graph</build_depend>
+  <build_depend>dynamic-graph-python</build_depend>
+  <build_depend>sot-core</build_depend>
+  <build_depend>sot-dynamic-pinocchio</build_depend>
+  <build_depend>dynamic_graph_bridge_msgs</build_depend>
+
+  <exec_depend>std_msgs</exec_depend>
+  <exec_depend>std_srvs</exec_depend>
+  <exec_depend>roscpp</exec_depend>
+  <exec_depend>geometry_msgs</exec_depend>
+  <exec_depend>sensor_msgs</exec_depend>
+  <exec_depend>tf</exec_depend>
+  <exec_depend>realtime_tools</exec_depend>
+  <exec_depend>message_generation</exec_depend>
+  <exec_depend>message_runtime</exec_depend>
+  <exec_depend>tf2_bullet</exec_depend>
+  <exec_depend>dynamic-graph</exec_depend>
+  <exec_depend>dynamic-graph-python</exec_depend>
+  <exec_depend>sot-core</exec_depend>
+  <exec_depend>sot-dynamic-pinocchio</exec_depend>
+  <exec_depend>dynamic_graph_bridge_msgs</exec_depend>
+
 </package>
-- 
GitLab