Skip to content
Snippets Groups Projects
Commit c707770e authored by Raphaël Lallement's avatar Raphaël Lallement
Browse files

Merge branch 'master' of ssh://trac.laas.fr/git/robots/robotpkg-wip

parents 7eea3b91 a7526b16
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
morse-pocolibs/Makefile
+ 10
− 34
View file @ c707770e
......@@ -15,52 +15,28 @@ CMAKE_ARGS+= -DBUILD_POCOLIBS_SUPPORT=ON
CMAKE_ARGS+= -DBUILD_ROS_SUPPORT=OFF
CMAKE_ARGS+= -DBUILD_YARP2_SUPPORT=OFF
CMAKE_ARGS+= -DSWIG_EXECUTABLE=${PREFIX.swig}/bin/swig
# pocolibs support
PKG_SUPPORTED_OPTIONS+= outdoor
PKG_OPTION_DESCR.outdoor= Enable support for field robotics components
PKG_SUPPORTED_OPTIONS+= viam
PKG_OPTION_DESCR.outdoor= Enable support for image camera support
define PKG_OPTION_SET.outdoor
CMAKE_ARGS+= -DBUILD_POCOLIBS_POM_SUPPORT=ON
define PKG_OPTION_SET.viam
CMAKE_ARGS+= -DBUILD_POCOLIBS_VIAM_SUPPORT=ON
CMAKE_ARGS+= -DBUILD_POCOLIBS_PLATINE_SUPPORT=ON
CMAKE_ARGS+= -DBUILD_POCOLIBS_GENPOS_SUPPORT=ON
PLIST_SRC= PLIST PLIST.common PLIST.outdoor
include ../../interfaces/genPos-genom/depend.mk
include ../../image/viam-genom/depend.mk
include ../../hardware/platine-genom/depend.mk
include ../../localization/pom-genom/depend.mk
include ../../middleware/pocolibs/depend.mk
endef
PKG_SUPPORTED_OPTIONS+= hri
PKG_OPTION_DESCR.hri=\
Enable support for human-robot interaction components
define PKG_OPTION_SET.hri
CMAKE_ARGS+= -DBUILD_POCOLIBS_POM_SUPPORT=ON
CMAKE_ARGS+= -DBUILD_POCOLIBS_LWR_SUPPORT=ON
CMAKE_ARGS+= -DBUILD_POCOLIBS_VIMAN_SUPPORT=ON
CMAKE_ARGS+= -DBUILD_POCOLIBS_HUMAN_POSTURE_SUPPORT=ON
CMAKE_ARGS+= -DBUILD_POCOLIBS_GENPOS_SUPPORT=ON
CMAKE_ARGS+= -DBUILD_POCOLIBS_PLATINE_SUPPORT=ON
PKG_SUPPORTED_OPTIONS+= stereopixel
PKG_OPTION_DESCR.outdoor= Enable support for depth camera support
PLIST_SRC= PLIST PLIST.common PLIST.hri
define PKG_OPTION_SET.stereopixel
CMAKE_ARGS+= -DBUILD_POCOLIBS_STEREOPIXEL_SUPPORT=ON
include ../../image/viman-genom/depend.mk
include ../../interfaces/genPos-genom/depend.mk
include ../../hardware/platine-genom/depend.mk
include ../../localization/pom-genom/depend.mk
include ../../wip/lwr-genom/depend.mk
include ../../wip/spark-genom/depend.mk
include ../../image/stereopixel-genom/depend.mk
include ../../middleware/pocolibs/depend.mk
endef
include ../../devel/swig/depend.mk
include ../../middleware/pocolibs/depend.mk
include ../../simulation/morse/depend.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
_pycompile_dir=${PREFIX}/${PYTHON_SITELIB}/morse/middleware/pocolibs*
......
morse-pocolibs/PLIST
+ 39
− 11
View file @ c707770e
@comment Wed Oct 31 11:00:29 CET 2012
${PYTHON_SITELIB}/morse/middleware/${PYTHON_PYCACHE}/pocolibs_mw${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/${PYTHON_PYCACHE}/pocolibs_mw${PYTHON_TAG}.pyo
@comment Fri Mar 1 18:22:15 CET 2013
${PYTHON_SITELIB}/morse/middleware/${PYTHON_PYCACHE}/pocolibs_datastream${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/${PYTHON_PYCACHE}/pocolibs_datastream${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/${PYTHON_PYCACHE}/pocolibs_request_manager${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/${PYTHON_PYCACHE}/pocolibs_request_manager${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/__init__.py
......@@ -9,6 +9,18 @@ ${PYTHON_SITELIB}/morse/middleware/pocolibs/${PYTHON_PYCACHE}/__init__${PYTHON_T
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/genpos${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/genpos${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/lwr${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/lwr${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/niut${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/niut${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/platine${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/platine${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/genpos.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/lwr.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/niut.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/platine.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
......@@ -24,15 +36,31 @@ ${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/fingers.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/platine_overlay.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/rflex_overlay.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/overlays/viam_overlay.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/General_Poster/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/General_Poster/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/General_Poster/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/General_Poster/${PYTHON_PYCACHE}/ors_poster${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/General_Poster/${PYTHON_PYCACHE}/ors_poster${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/General_Poster/_ors_poster.so
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/General_Poster/ors_poster.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs_mw.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/human_posture${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/human_posture${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/platine_posture${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/platine_posture${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/pom${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/pom${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/stereopixel${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/stereopixel${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/target${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/target${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/viam${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/viam${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/viman${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/viman${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/human_posture.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/platine_posture.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/pom.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/stereopixel.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/target.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/viam.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/viman.py
${PLIST.stereopixel}${PYTHON_SITELIB}/morse/middleware/pocolibs/stereopixel.so
${PLIST.viam}${PYTHON_SITELIB}/morse/middleware/pocolibs/viam.so
${PYTHON_SITELIB}/morse/middleware/pocolibs_datastream.py
${PYTHON_SITELIB}/morse/middleware/pocolibs_request_manager.py
morse-pocolibs/PLIST.common deleted 100644 → 0
+ 0
− 31
View file @ 7eea3b91
@comment Thu Sep 22 14:50:28 CEST 2011
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Genpos_Poster/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Genpos_Poster/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Genpos_Poster/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Genpos_Poster/${PYTHON_PYCACHE}/ors_genpos_poster${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Genpos_Poster/${PYTHON_PYCACHE}/ors_genpos_poster${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Genpos_Poster/_ors_genpos_poster.so
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Genpos_Poster/ors_genpos_poster.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Platine_Poster/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Platine_Poster/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Platine_Poster/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Platine_Poster/${PYTHON_PYCACHE}/ors_platine_poster${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Platine_Poster/${PYTHON_PYCACHE}/ors_platine_poster${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Platine_Poster/_ors_platine_poster.so
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/Platine_Poster/ors_platine_poster.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/genpos${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/genpos${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/platine${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/${PYTHON_PYCACHE}/platine${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/genpos.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/actuators/platine.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Pom_Poster/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Pom_Poster/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Pom_Poster/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Pom_Poster/${PYTHON_PYCACHE}/ors_pom_poster${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Pom_Poster/${PYTHON_PYCACHE}/ors_pom_poster${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Pom_Poster/_ors_pom_poster.so
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Pom_Poster/ors_pom_poster.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/pom${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/pom${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/pom.py
morse-pocolibs/PLIST.hri deleted 100644 → 0
+ 0
− 1
View file @ 7eea3b91
@comment Thu Sep 22 14:50:28 CEST 2011
morse-pocolibs/PLIST.outdoor deleted 100644 → 0
+ 0
− 11
View file @ 7eea3b91
@comment Thu Sep 22 14:50:28 CEST 2011
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Viam_Poster/__init__.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Viam_Poster/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Viam_Poster/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Viam_Poster/${PYTHON_PYCACHE}/ors_viam_poster${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Viam_Poster/${PYTHON_PYCACHE}/ors_viam_poster${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Viam_Poster/_ors_viam_poster.so
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/Viam_Poster/ors_viam_poster.py
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/viam${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/${PYTHON_PYCACHE}/viam${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/morse/middleware/pocolibs/sensors/viam.py
morse-pocolibs/depend.mk
+ 1
− 1
View file @ c707770e
......@@ -19,7 +19,7 @@ DEPEND_ABI.morse-pocolibs?= morse-pocolibs>=0.2
DEPEND_DIR.morse-pocolibs?= ../../wip/morse-pocolibs
SYSTEM_SEARCH.morse-pocolibs=\
lib/python*/{site,dist}-packages/morse/middleware/pocolibs_mw.py
lib/python*/{site,dist}-packages/morse/middleware/pocolibs_datastream.py
include ../../mk/sysdep/python.mk
......
py-morse/Makefile
+ 2
− 2
View file @ c707770e
......@@ -2,7 +2,7 @@
# Created: Severin Lemaignan on Tue, 12 Apr 2011
#
VERSION= 0.6
VERSION= 1.0
PKGNAME= ${PKGTAG.python}-morse-${VERSION}
DISTNAME= morse-${VERSION}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=morse/}
......@@ -26,7 +26,7 @@ CMAKE_ARGS+= -DBUILD_YARP2_SUPPORT=OFF
CMAKE_ARGS+= -DPYMORSE_SUPPORT=ON
DEPEND_ABI.python+= python>=2.6<3.3
DEPEND_ABI.python+= python>=3.2<3.3
include ../../mk/sysdep/python.mk
include ../../mk/sysdep/cmake.mk
......
py-morse/PLIST
+ 19
− 7
View file @ c707770e
@comment Wed Oct 31 16:40:58 CET 2012
lib/python3/dist-packages/pymorse-testing.py
lib/python3/dist-packages/${PYTHON_PYCACHE}/pymorse-testing${PYTHON_TAG}.pyc
lib/python3/dist-packages/${PYTHON_PYCACHE}/pymorse-testing${PYTHON_TAG}.pyo
lib/python3/dist-packages/pymorse.py
lib/python3/dist-packages/${PYTHON_PYCACHE}/pymorse${PYTHON_TAG}.pyc
lib/python3/dist-packages/${PYTHON_PYCACHE}/pymorse${PYTHON_TAG}.pyo
@comment Fri Mar 1 18:17:41 CET 2013
lib/python3/dist-packages/pymorse/__init__.py
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/future${PYTHON_TAG}.pyc
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/future${PYTHON_TAG}.pyo
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse-internals-testing${PYTHON_TAG}.pyc
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse-internals-testing${PYTHON_TAG}.pyo
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse-testing${PYTHON_TAG}.pyc
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse-testing${PYTHON_TAG}.pyo
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse${PYTHON_TAG}.pyc
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse${PYTHON_TAG}.pyo
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/stream${PYTHON_TAG}.pyc
lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/stream${PYTHON_TAG}.pyo
lib/python3/dist-packages/pymorse/future.py
lib/python3/dist-packages/pymorse/pymorse-internals-testing.py
lib/python3/dist-packages/pymorse/pymorse-testing.py
lib/python3/dist-packages/pymorse/pymorse.py
lib/python3/dist-packages/pymorse/stream.py
py-morse/distinfo
+ 3
− 3
View file @ c707770e
SHA1 (morse-0.6.tar.bz2) = efece2b2a9155e55d81f8d6b63d5c553e94ebd21
RMD160 (morse-0.6.tar.bz2) = fa275b2bac78b5fcb8334cbd38283bcaa78cd705
Size (morse-0.6.tar.bz2) = 106996031 bytes
SHA1 (morse-1.0.tar.bz2) = d4539239619b4ec115e6657f8dbed60544e7fdfd
RMD160 (morse-1.0.tar.bz2) = ad06ce54eded060e037e59516bf4db41647423c7
Size (morse-1.0.tar.bz2) = 96565927 bytes
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