Merge branch 'topic/pyrene'

stack-of-tasks · May 7, 2018 · ff42250 · ff42250
2 parents 2d960ac + d811b78
commit ff42250
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 1,774 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -18,15 +18,18 @@ cache:
     ROBOTPKG: talos-metapkg-ros-control-sot
     CATEGORY: wip
   before_script:
-    - mkdir -p ccache
+    - mkdir -p build/ccache
+    - cd build
+    - export CCACHE_BASEDIR=${PWD}
+    - export CCACHE_DIR=${PWD}/ccache
   script:
     - cd /root/robotpkg/${CATEGORY}/${ROBOTPKG}
     - git pull
-    - make checkout MASTER_REPOSITORY="dir ${CI_PROJECT_DIR}"
+    - echo "MASTER_REPOSITORY = git ${CI_PROJECT_DIR}" >> Makefile
+    - echo "REPOSITORY.talos-metapkg-ros-control-sot = git ${CI_PROJECT_DIR}" >> /opt/openrobots/etc/robotpkg.conf
+    - make checkout
     - make install
-    - cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
-
-
+    - cd work.*/${PROJECT}*/
   except:
     - gh-pages
 
@@ -39,11 +42,7 @@ robotpkg-talos-metapkg-ros-control-sot-14.04:
 robotpkg-talos-metapkg-ros-control-sot-16.04:
   <<: *robotpkg-talos-metapkg-ros-control-sot
   image: ${IMAGE}:16.04
-
-
+
 robotpkg-talos-metapkg-ros-control-sot-dubnium:
   <<: *robotpkg-talos-metapkg-ros-control-sot
   image: ${IMAGE}:dubnium
-
-
-
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "talos_roscontrol_sot/cmake"]
-	path = talos_roscontrol_sot/cmake
-	url = https://github.com/jrl-umi3218/jrl-cmakemodules.git

diff --git a/sot_pyrene_bringup/launch/geometric_simu.launch b/sot_pyrene_bringup/launch/geometric_simu.launch
@@ -5,6 +5,7 @@
   <!-- Which robot are we controlling ? -->
   <arg name="robot" default="pyrene" />
   <arg name="libsot" default="libsot-pyrene-controller.so" />   
+
   <arg name="sot-launch-prefix" default="" />   
 
   <include file="$(find sot_pyrene_bringup)/launch/geometric_simu_context.launch" >
@@ -18,6 +19,7 @@
 	pkg="dynamic_graph_bridge"
 	type="geometric_simu"
         args=" --input-file $(arg libsot)" 
+
         launch-prefix="$(arg sot-launch-prefix)"
 	respawn="true">
     <param name="/sot/dg/geometric_simu" value="" />

diff --git a/talos_roscontrol_sot/CMakeLists.txt b/talos_roscontrol_sot/CMakeLists.txt
diff --git a/talos_roscontrol_sot/LICENSE b/talos_roscontrol_sot/LICENSE
diff --git a/talos_roscontrol_sot/README.md b/talos_roscontrol_sot/README.md
diff --git a/talos_roscontrol_sot/cmake b/talos_roscontrol_sot/cmake
diff --git a/talos_roscontrol_sot/config/gazebo_roscontrol_sot_controller_plugins.xml b/talos_roscontrol_sot/config/gazebo_roscontrol_sot_controller_plugins.xml
diff --git a/talos_roscontrol_sot/config/roscontrol_sot_controller_plugins.xml b/talos_roscontrol_sot/config/roscontrol_sot_controller_plugins.xml
diff --git a/talos_roscontrol_sot/config/rosdoc.yaml b/talos_roscontrol_sot/config/rosdoc.yaml
diff --git a/talos_roscontrol_sot/doc/Doxyfile.extra.in b/talos_roscontrol_sot/doc/Doxyfile.extra.in
diff --git a/talos_roscontrol_sot/doc/manifest.yaml b/talos_roscontrol_sot/doc/manifest.yaml
diff --git a/talos_roscontrol_sot/launch/sot_controller_gazebo.launch b/talos_roscontrol_sot/launch/sot_controller_gazebo.launch
diff --git a/talos_roscontrol_sot/package.xml b/talos_roscontrol_sot/package.xml