diff --git a/Makefile b/Makefile index 2a83b0d7f79847c1aa89325db6794dffd89079e0..d9356af6526ded56e550bbe1089d98c108be0cf8 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,6 @@ SUBDIR+= jafar-rtslam SUBDIR+= jido-pick-object SUBDIR+= jointStateMapper SUBDIR+= joystick-genom -SUBDIR+= jrl-dynamics-urdf SUBDIR+= kukaFri-libs SUBDIR+= laas-rackham SUBDIR+= laaswm-gui diff --git a/dynamic-graph-bridge/Makefile b/dynamic-graph-bridge/Makefile index 387e86454872d864c7e6cec1b080e27d2f096361..934970b2a19b0eaad0c75aea1720f489ea591c43 100755 --- a/dynamic-graph-bridge/Makefile +++ b/dynamic-graph-bridge/Makefile @@ -30,7 +30,7 @@ include ../../motion/dynamic-graph/depend.mk include ../../motion/py-dynamic-graph/depend.mk include ../../motion/sot-core/depend.mk include ../../motion/sot-dynamic/depend.mk -include ../../wip/jrl-dynamics-urdf/depend.mk +include ../../math/jrl-dynamics-urdf/depend.mk include ../../interfaces/jrl-mal/depend.mk include ../../simulation/bullet/depend.mk include ../../devel/ros-roscpp-core/depend.mk diff --git a/jrl-dynamics-urdf/DESCR b/jrl-dynamics-urdf/DESCR deleted file mode 100644 index 7c0f374652b0ab24ddedfb6549a2c5dab30fc059..0000000000000000000000000000000000000000 --- a/jrl-dynamics-urdf/DESCR +++ /dev/null @@ -1 +0,0 @@ -JRL Implementation of a dynamic robot. diff --git a/jrl-dynamics-urdf/Makefile b/jrl-dynamics-urdf/Makefile deleted file mode 100644 index 2de5e45f4f974562ee033e35d8e4e66150981f52..0000000000000000000000000000000000000000 --- a/jrl-dynamics-urdf/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# robotpkg Makefile for: math/jrl-dynamics-urdf -# Created: Olivier Stasse on Thu, 27 Jun 2013 -# -DISTNAME= jrl-dynamics-urdf-2.2.0 -MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=jrl-dynamics-urdf/} -MASTER_REPOSITORY= git git://github.com/laas/jrl_dynamics_urdf.git - -CATEGORIES= math -COMMENT= JRL-Japan implementation of dynamic robot -LICENSE= gnu-lgpl-v3 -MAINTAINER= hpp@laas.fr - -DYNAMIC_PLIST_DIRS+= share/doc/jrl-dynamics-urdf -USE_BOOST_LIBS+= filesystem system - -CMAKE_ARGS+= -DGTEST_ROOT=${PREFIX.googletest} - -include ../../devel/boost-headers/depend.mk -include ../../devel/boost-libs/depend.mk -include ../../sysutils/ros-rospack/depend.mk -include ../../graphics/ros-robot-model/depend.mk -include ../../graphics/urdfdom/depend.mk -include ../../graphics/urdfdom-headers/depend.mk -include ../../interfaces/jrl-mal/depend.mk -include ../../math/jrl-dynamics/depend.mk -include ../../pkgtools/pkg-config/depend.mk -include ../../simulation/bullet/depend.mk -include ../../mk/sysdep/cmake.mk -include ../../mk/sysdep/doxygen.mk -include ../../mk/sysdep/googletest.mk -include ../../mk/sysdep/graphviz.mk -include ../../mk/sysdep/pdflatex.mk -include ../../mk/language/c.mk -include ../../mk/language/c++.mk -include ../../mk/robotpkg.mk diff --git a/jrl-dynamics-urdf/PLIST b/jrl-dynamics-urdf/PLIST deleted file mode 100644 index 0e86dae8a9767893672dd0e5fb3885c316229075..0000000000000000000000000000000000000000 --- a/jrl-dynamics-urdf/PLIST +++ /dev/null @@ -1,11 +0,0 @@ -@comment Thu Jun 19 08:33:37 CEST 2014 -bin/display-robot -include/jrl/dynamics/urdf/config.h -include/jrl/dynamics/urdf/config.hh -include/jrl/dynamics/urdf/deprecated.hh -include/jrl/dynamics/urdf/doc.hh -include/jrl/dynamics/urdf/parser.hh -include/jrl/dynamics/urdf/warning.hh -lib/libjrl-dynamics-urdf.so -lib/libjrl-dynamics-urdf.so.${PKGVERSION} -lib/pkgconfig/jrl-dynamics-urdf.pc diff --git a/jrl-dynamics-urdf/depend.mk b/jrl-dynamics-urdf/depend.mk deleted file mode 100644 index 4ec7fbefde1c74c04edc823cb93424bd0823b9d2..0000000000000000000000000000000000000000 --- a/jrl-dynamics-urdf/depend.mk +++ /dev/null @@ -1,33 +0,0 @@ -# robotpkg depend.mk for: math/jrl-dynamics-urdf -# Created: Olivier Stasse on Fri, Jun 28 -# - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -JRL_DYNAMICS_URDF_DEPEND_MK:= ${JRL_DYNAMICS_URDF_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= jrl-dynamics-urdf -endif - -ifeq (+,$(JRL_DYNAMICS_URDF_DEPEND_MK)) # --------------------------------- - -include ../../interfaces/jrl-mal/depend.mk -include ../../math/jrl-dynamics/depend.mk -include ../../graphics/urdfdom/depend.mk -include ../../graphics/urdfdom-headers/depend.mk - -PREFER.jrl-dynamics-urdf?= robotpkg - -DEPEND_USE+= jrl-dynamics-urdf - -DEPEND_ABI.jrl-dynamics-urdf?= jrl-dynamics-urdf>=1.0.0 -DEPEND_DIR.jrl-dynamics-urdf?= ../../wip/jrl-dynamics-urdf - -SYSTEM_SEARCH.jrl-dynamics-urdf=\ - 'bin/display-robot' \ - 'include/jrl/dynamics/urdf/parser.hh' \ - 'lib/libjrl-dynamics-urdf.so' - -endif # JRL_DYNAMICS_URDF_DEPEND_MK --------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/jrl-dynamics-urdf/distinfo b/jrl-dynamics-urdf/distinfo deleted file mode 100644 index aa181300afdf1922e8facca9c81c905aa1709046..0000000000000000000000000000000000000000 --- a/jrl-dynamics-urdf/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -SHA1 (jrl-dynamics-urdf-2.2.0.tar.gz) = 691ec29131b7dd8cf058eac2e23c2a8fd8967545 -RMD160 (jrl-dynamics-urdf-2.2.0.tar.gz) = 27cff7b64411e504aa5e229f5e23253e1dd6cb85 -Size (jrl-dynamics-urdf-2.2.0.tar.gz) = 87211 bytes -SHA1 (patch-aa) = 9d7e87f694698a6c52a0f23b692d332005cd932b -SHA1 (patch-ab) = d4aa07a25a305be11b11e3b2fc798165a0ba4db0 -SHA1 (patch-ac) = 59a0d53d1befd629e4a12e9abd1fc194fabebaad diff --git a/jrl-dynamics-urdf/patches/patch-aa b/jrl-dynamics-urdf/patches/patch-aa deleted file mode 100644 index 4a5f8aa51d23c6c1c23907af0fef6db7abc15e68..0000000000000000000000000000000000000000 --- a/jrl-dynamics-urdf/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -Don't force BOOST_FILESYSTEM_VERSION=2, this is not supported in boost>=1.50 - ---- CMakeLists.txt~ 2014-04-29 12:06:55.000000000 +0200 -+++ CMakeLists.txt 2014-06-19 08:16:36.244048000 +0200 -@@ -47,8 +47,6 @@ - # Add Boost path to include directories. - INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) - --# Make sure Boost.Filesystem v2 is used. --ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2) - - ADD_SUBDIRECTORY(src) - ADD_SUBDIRECTORY(examples)