Skip to content
Snippets Groups Projects
Commit 12ec9b14 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/prf-gazebo-ros-pkgs{,-melodic}] merge 

And upgrade kinetic version to 2.6.9.

Changes in 2.6.9 (2019-11-05)
- Fix shadowed variables
- Contributors: Victor Lopez
parent 6bea21d3
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 74 additions and 625 deletions
pal-gazebo-plugins/Makefile
+ 1
− 1
View file @ 12ec9b14
......@@ -30,7 +30,7 @@ ifeq (16.04,${OS_VERSION})
endif
include ../../wip/pal-msgs/depend.mk
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
......
pal-gazebo-worlds/Makefile
+ 5
− 5
View file @ 12ec9b14
......@@ -22,11 +22,11 @@ MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Simulation worlds for PAL robots
LICENSE= gnu-lgpl-v3
ifneq (,$(filter 16.04,${OS_VERSION}))
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
else
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
endif
CMAKE_PREFIX_PATH+= ${PREFIX}
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
CMAKE_PREFIX_PATH+= ${PREFIX}
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-roscpp-core/depend.mk
......
pal-hardware-gazebo-melodic/Makefile
+ 1
− 1
View file @ 12ec9b14
......@@ -38,7 +38,7 @@ include ../../lang/ros-message-runtime/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/py-pal-statistics/depend.mk
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/dynamic-introspection/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
......
prf-gazebo-ros-pkgs-melodic/DESCR deleted 100644 → 0
+ 0
− 1
View file @ 6bea21d3
gazebo_ros_control from pal-robotics-forks (melodic branch)
prf-gazebo-ros-pkgs-melodic/Makefile deleted 100644 → 0
+ 0
− 60
View file @ 6bea21d3
# robotpkg Makefile for: wip/prf-gazebo-ros-pkgs-melodic
# Created: Olivier Stasse on Mer, 2 Jan 2020
#
ORG= pal-robotics-forks
VERSION= 3.0.1
PRFNAME= gazebo-ros-pkgs
PKGBASE= prf-${PRFNAME}-melodic
PKGNAME= ${PKGBASE}-${VERSION}
DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PRFNAME})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${PKGBASE}
CATEGORIES= wip
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Wrappers, tools and additional API for using ROS with Gazebo.
LICENSE= 2-clause-bsd
CONFLICTS+= gazebo-ros-pkgs-[0-9]*
CONFLICTS+= prf-gazebo-ros-pkgs-[0-9]*
ROS_METAPKG= yes
CMAKE_ARGS+=\
-Dgazebo_INCLUDE_DIRS=$(filter include/%,${SYSTEM_SEARCH.gazebo}) \
-Dgazebo_LIBRARIES=$(filter %.so,${SYSTEM_SEARCH.gazebo})
CMAKE_PREFIX_PATH+= ${PREFIX}
include ../../devel/ros-cmake-modules/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-nodelet-core/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../devel/ros-pluginlib/depend.mk
include ../../devel/ros-ros/depend.mk
include ../../graphics/ros-urdf/depend.mk
include ../../image/ros-image-common/depend.mk
include ../../image/ros-vision-opencv/depend.mk
include ../../interfaces/ros-common-msgs/depend.mk
include ../../interfaces/ros-std-msgs/depend.mk
include ../../lang/ros-message-generation/depend.mk
include ../../lang/ros-message-runtime/depend.mk
include ../../math/ros-angles/depend.mk
include ../../math/ros-geometry/depend.mk
include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../sysutils/ros-diagnostics/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../mk/sysdep/gazebo.mk
include ../../mk/sysdep/libogre.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
prf-gazebo-ros-pkgs-melodic/PLIST deleted 100644 → 0
+ 0
− 457
View file @ 6bea21d3
This diff is collapsed.
prf-gazebo-ros-pkgs-melodic/depend.mk deleted 100644 → 0
+ 0
− 31
View file @ 6bea21d3
# robotpkg depend.mk for: wip/prf-gazebo-ros-pkgs-melodic
# Created: Olivier Stasse on Mer, 2 Jan 2020
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
GAZEBO_ROS_PKGS_MELODIC_DEPEND_MK:= ${GAZEBO_ROS_PKGS_MELODIC_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= prf-gazebo-ros-pkgs-melodic
endif
ifeq (+,$(GAZEBO_ROS_PKGS_MELODIC_DEPEND_MK)) # ---------------------------
PREFER.prf-gazebo-ros-pkgs-melodic?= robotpkg
DEPEND_USE+= prf-gazebo-ros-pkgs-melodic
DEPEND_ABI.prf-gazebo-ros-pkgs-melodic?= prf-gazebo-ros-pkgs-melodic>=3.0.1
DEPEND_DIR.prf-gazebo-ros-pkgs-melodic?= ../../wip/prf-gazebo-ros-pkgs-melodic
SYSTEM_SEARCH.prf-gazebo-ros-pkgs-melodic=\
'include/gazebo_ros_control/gazebo_ros_control_plugin.h' \
'include/gazebo_ros_control/default_robot_hw_sim.h' \
'include/gazebo_ros_control/robot_hw_sim.h' \
'share/gazebo_ros_control/cmake/gazebo_ros_controlConfig.cmake' \
'share/gazebo_ros_control/package.xml:/<version>/s/[^0-9.]//gp' \
'lib/pkgconfig/gazebo_ros_control.pc:/Version/s/[^0-9.]//gp'
endif # GAZEBO_ROS_PKGS_DEPEND_MK ---------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
prf-gazebo-ros-pkgs-melodic/distinfo deleted 100644 → 0
+ 0
− 4
View file @ 6bea21d3
SHA1 (prf-gazebo-ros-pkgs-melodic/3.0.1.tar.gz) = abc1d1188a8f85cccd3f7aae02ad5025f961a502
RMD160 (prf-gazebo-ros-pkgs-melodic/3.0.1.tar.gz) = c455e72a1385144d02293285d6310051f81ca393
Size (prf-gazebo-ros-pkgs-melodic/3.0.1.tar.gz) = 1858951 bytes
SHA1 (patch-aa) = 47fb92ee7215c46780ebb50d863cb02a7d19c968
prf-gazebo-ros-pkgs/Makefile
+ 34
− 25
View file @ 12ec9b14
# robotpkg Makefile for: wip/prf-gazebo-ros-pkgs
# Created: Olivier Stasse on Mer, 28 April 2018
#
ORG= pal-robotics-forks
VERSION= 2.6.8
PRFNAME= gazebo-ros-pkgs
PKGBASE= prf-${PRFNAME}
PKGNAME= ${PKGBASE}-${VERSION}
DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PRFNAME})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${PKGBASE}
PKGREVISION= 1
CATEGORIES= wip
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
ORG= pal-robotics-forks
NAME= gazebo-ros-pkgs
VERSION= 3.0.1
ONLY_FOR_PLATFORM= Ubuntu-16.04-%
PRFNAME= prf-${NAME}
ROSNAME= $(subst -,_,${NAME})
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
PKGNAME= ${PRFNAME}-${VERSION}
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DISTNAME= ${VERSION}
DIST_SUBDIR= ${PRFNAME}
COMMENT= Wrappers, tools and additional API for using ROS with Gazebo.
LICENSE= 2-clause-bsd
CONFLICTS+= ${NAME}-[0-9]*
CATEGORIES= wip
CONFLICTS+= gazebo-ros-pkgs-[0-9]*
ROS_METAPKG= yes
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${ROSNAME}.git
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
CMAKE_ARGS+=\
-Dgazebo_INCLUDE_DIRS=$(filter include/%,${SYSTEM_SEARCH.gazebo}) \
-Dgazebo_LIBRARIES=$(filter %.so,${SYSTEM_SEARCH.gazebo})
COMMENT= Wrappers, tools and additional API for using ROS with Gazebo.
LICENSE= 2-clause-bsd
CMAKE_PREFIX_PATH+= ${PREFIX}
ROS_METAPKG= yes
CMAKE_ARGS+= -Dgazebo_INCLUDE_DIRS=$(filter include/%,${SYSTEM_SEARCH.gazebo})
CMAKE_ARGS+= -Dgazebo_LIBRARIES=$(filter %.so,${SYSTEM_SEARCH.gazebo})
CMAKE_PREFIX_PATH+= ${PREFIX}
# According to PAL instructions, we stay on the kinetic branch on 16.04
include ../../mk/robotpkg.prefs.mk
ifeq (16.04,${OS_VERSION})
VERSION= 2.6.9
DISTINFO_FILE= ${ROBOTPKG_DIR}/${CATEGORIES}/${PRFNAME}/distinfo.${OS_VERSION}
PATCHDIR= ${ROBOTPKG_DIR}/${CATEGORIES}/${PRFNAME}/patches.${OS_VERSION}
endif
include ../../wip/py-prf-ros-control/depend.mk
include ../../devel/ros-cmake-modules/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-nodelet-core/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../devel/ros-pluginlib/depend.mk
include ../../devel/ros-ros/depend.mk
......@@ -52,7 +62,6 @@ include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../sysutils/ros-diagnostics/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../mk/sysdep/gazebo.mk
include ../../mk/sysdep/libogre.mk
include ../../mk/language/c++.mk
......
prf-gazebo-ros-pkgs/PLIST
+ 1
− 0
View file @ 12ec9b14
......@@ -155,6 +155,7 @@ lib/libgazebo_ros_force.so
lib/libgazebo_ros_ft_sensor.so
lib/libgazebo_ros_gpu_laser.so
lib/libgazebo_ros_hand_of_god.so
lib/libgazebo_ros_harness.so
lib/libgazebo_ros_imu.so
lib/libgazebo_ros_imu_sensor.so
lib/libgazebo_ros_joint_pose_trajectory.so
......
prf-gazebo-ros-pkgs/depend.mk
+ 9
− 2
View file @ 12ec9b14
# robotpkg depend.mk for: wip/gazebo_ros_pkgs
# robotpkg depend.mk for: wip/prf-gazebo-ros-pkgs
# Created: Olivier Stasse on Mer, 3 May 2017
#
......@@ -11,11 +11,18 @@ endif
ifeq (+,$(GAZEBO_ROS_PKGS_DEPEND_MK)) # ---------------------------
include ../../mk/robotpkg.prefs.mk # for OS_VERSION
PREFER.prf-gazebo-ros-pkgs?= robotpkg
DEPEND_USE+= prf-gazebo-ros-pkgs
DEPEND_ABI.prf-gazebo-ros-pkgs?= prf-gazebo-ros-pkgs>=2.6.5
ifneq (,$(filter 16.04,${OS_VERSION}))
DEPEND_ABI.prf-gazebo-ros-pkgs?= prf-gazebo-ros-pkgs>=2.6.5<3.0.0
else
DEPEND_ABI.prf-gazebo-ros-pkgs?= prf-gazebo-ros-pkgs>=3.0.1
endif
DEPEND_DIR.prf-gazebo-ros-pkgs?= ../../wip/prf-gazebo-ros-pkgs
SYSTEM_SEARCH.prf-gazebo-ros-pkgs=\
......
prf-gazebo-ros-pkgs/distinfo
+ 4
− 3
View file @ 12ec9b14
SHA1 (prf-gazebo-ros-pkgs/2.6.8.tar.gz) = a2d4e4164ba615a9e5c2b4852ce603cc896e7854
RMD160 (prf-gazebo-ros-pkgs/2.6.8.tar.gz) = ee90a8f843774a7307c37ef76ebb5f1c6fce9e8a
Size (prf-gazebo-ros-pkgs/2.6.8.tar.gz) = 1856656 bytes
SHA1 (prf-gazebo-ros-pkgs/3.0.1.tar.gz) = abc1d1188a8f85cccd3f7aae02ad5025f961a502
RMD160 (prf-gazebo-ros-pkgs/3.0.1.tar.gz) = c455e72a1385144d02293285d6310051f81ca393
Size (prf-gazebo-ros-pkgs/3.0.1.tar.gz) = 1858951 bytes
SHA1 (patch-aa) = 47fb92ee7215c46780ebb50d863cb02a7d19c968
prf-gazebo-ros-pkgs/distinfo.16.04 0 → 100644
+ 3
− 0
View file @ 12ec9b14
SHA1 (prf-gazebo-ros-pkgs/2.6.9.tar.gz) = 63572e89937dfbd87d04ed4c05ec51c65ea4fd48
RMD160 (prf-gazebo-ros-pkgs/2.6.9.tar.gz) = 62f55280fadfbe8848d812f4ccf0e25f72eb7972
Size (prf-gazebo-ros-pkgs/2.6.9.tar.gz) = 1858897 bytes
prf-roboticsgroup-gazebo-plugins/Makefile
+ 5
− 7
View file @ 12ec9b14
......@@ -27,6 +27,11 @@ CMAKE_ARGS+=\
-Dgazebo_INCLUDE_DIRS=$(filter include/%,${SYSTEM_SEARCH.gazebo}) \
-Dgazebo_LIBRARIES=$(filter %.so,${SYSTEM_SEARCH.gazebo})
CMAKE_PREFIX_PATH+= ${PREFIX}
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../devel/ros-catkin/depend.mk
......@@ -40,13 +45,6 @@ include ../../math/ros-geometry/depend.mk
include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../wip/sysdep/ubuntu-distro.mk
ifeq (xenial,${UBUNTUDISTRO})
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
else
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
endif
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../mk/sysdep/gazebo.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
......
py-prf-ros-controllers/Makefile
+ 1
− 1
View file @ 12ec9b14
......@@ -23,7 +23,7 @@ CONFLICTS+= talos-${NAME}-[0-9]*
CATEGORIES= wip
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${ROSNAME}.git
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
......
py-talos-dev/Makefile
+ 1
− 5
View file @ 12ec9b14
......@@ -11,11 +11,7 @@ COMMENT= Talos dev Software
META_PACKAGE= yes
ifneq (,$(filter 16.04,${OS_VERSION}))
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
else
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
endif
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/py-sot-talos/depend.mk
......
talos-data/Makefile
+ 2
− 7
View file @ 12ec9b14
......@@ -21,6 +21,8 @@ CMAKE_PREFIX_PATH+= ${PREFIX}
DYNAMIC_PLIST_DIRS+= share/doc/${ROSNAME}
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../devel/ros-catkin/depend.mk
include ../../interfaces/ros-common-msgs/depend.mk
......@@ -31,13 +33,6 @@ include ../../lang/ros-message-runtime/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../wip/sysdep/ubuntu-distro.mk
ifeq (xenial,${UBUNTUDISTRO})
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
else
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
endif
include ../../mk/sysdep/gazebo.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk
......
talos-simulation/Makefile
+ 1
− 5
View file @ 12ec9b14
......@@ -63,11 +63,7 @@ include ../../wip/talos-robot/depend.mk
include ../../wip/talos-moveit-config/depend.mk
include ../../wip/prf-roboticsgroup-gazebo-plugins/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
ifeq (xenial,${UBUNTUDISTRO})
include ../../wip/pal-gazebo-plugins/depend.mk
else
include ../../wip/pal-gazebo-plugins-melodic/depend.mk
endif
include ../../wip/pal-gazebo-plugins/depend.mk
include ../../wip/pal-gazebo-worlds/depend.mk
include ../../wip/head-action/depend.mk
......
tiago-dev/Makefile
+ 6
− 10
View file @ 12ec9b14
......@@ -11,14 +11,10 @@ COMMENT= Tiago dev Software
META_PACKAGE= yes
include ../py-sot-tiago/depend.mk
include ../tiago-metapkg-ros-control-sot/depend.mk
include ../../wip/sysdep/ubuntu-distro.mk
ifeq (xenial,${UBUNTUDISTRO})
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
else
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
endif
include ../tiago-simulation/depend.mk
include ../pal-wsg-gripper/depend.mk
include ../../wip/py-sot-tiago/depend.mk
include ../../wip/pal-wsg-gripper/depend.mk
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
include ../../wip/tiago-metapkg-ros-control-sot/depend.mk
include ../../wip/tiago-simulation/depend.mk
include ../../mk/robotpkg.mk
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment