From 0661253cb83ae8418e003e78091f895326eda66f Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@isae-supaero.fr>
Date: Mon, 8 Feb 2016 13:16:31 +0100
Subject: [PATCH] [wip/morse-ros] Upgrade to 1.4
Changes since 1.3:
==================
- Some ROS 'housekeeping' has been performed in this release, including
removing the need for rospkg (easier installation!), removing ROS interface
with the non-standard (and unused?) JointPositions message and removing
references roslib.load_manifest(), a memory of rosbuild-era.
---
morse-ros/Makefile | 2 +-
morse-ros/PLIST | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/morse-ros/Makefile b/morse-ros/Makefile
index 7ea7dfaa..5bacc91f 100644
--- a/morse-ros/Makefile
+++ b/morse-ros/Makefile
@@ -15,11 +15,11 @@ CMAKE_ARGS+= -DBUILD_ROS_SUPPORT=ON
CMAKE_ARGS+= -DBUILD_YARP_SUPPORT=OFF
CMAKE_ARGS+= -DBUILD_MOOS_SUPPORT=OFF
CMAKE_ARGS+= -DBUILD_HLA_SUPPORT=OFF
+CMAKE_ARGS+= -DBUILD_MAVLINK_SUPPORT=OFF
CMAKE_ARGS+= -DPYMORSE_SUPPORT=OFF
#include ../../interfaces/ros-common-msgs/depend.mk
include ../../wip/py-yaml/depend.mk
-include ../../sysutils/py-rospkg/depend.mk
include ../../sysutils/py-catkin-pkg/depend.mk
include ../../simulation/morse/depend.mk
include ../../mk/robotpkg.mk
diff --git a/morse-ros/PLIST b/morse-ros/PLIST
index 15bdec34..86de395a 100644
--- a/morse-ros/PLIST
+++ b/morse-ros/PLIST
@@ -1,4 +1,4 @@
-@comment Mon May 11 09:14:36 CEST 2015
+@comment Mon Feb 8 10:23:23 CET 2016
${PYTHON_SITELIB}/morse/middleware/ros/__init__.py
${PYTHON_SITELIB}/morse/middleware/ros/abstract_ros.py
${PYTHON_SITELIB}/morse/middleware/ros/accelerometer.py
@@ -8,14 +8,11 @@ ${PYTHON_SITELIB}/morse/middleware/ros/depth_camera.py
${PYTHON_SITELIB}/morse/middleware/ros/destination.py
${PYTHON_SITELIB}/morse/middleware/ros/force_torque.py
${PYTHON_SITELIB}/morse/middleware/ros/gps.py
-${PYTHON_SITELIB}/morse/middleware/ros/helpers.py
${PYTHON_SITELIB}/morse/middleware/ros/imu.py
${PYTHON_SITELIB}/morse/middleware/ros/infrared.py
${PYTHON_SITELIB}/morse/middleware/ros/jido_posture.py
-${PYTHON_SITELIB}/morse/middleware/ros/jointpositions.py
${PYTHON_SITELIB}/morse/middleware/ros/jointstate.py
${PYTHON_SITELIB}/morse/middleware/ros/jointtrajectorycontrollers.py
-${PYTHON_SITELIB}/morse/middleware/ros/kuka_jointpositions.py
${PYTHON_SITELIB}/morse/middleware/ros/kuka_jointstate.py
${PYTHON_SITELIB}/morse/middleware/ros/kuka_jointstate_pub.py
${PYTHON_SITELIB}/morse/middleware/ros/laserscanner.py
--
GitLab