diff --git a/Makefile b/Makefile index ec2c9ee8dc743ffb4ac5634cf2d8c368624368ba..a40e0072938293c6622d950c72845b62ed5b7468 100644 --- a/Makefile +++ b/Makefile @@ -107,6 +107,7 @@ SUBDIR+= sot-hrprtc-hrp2 SUBDIR+= sot-pattern-generator-v3 SUBDIR+= sot-romeo-v3 SUBDIR+= sot-talos +SUBDIR+= sot-tools-v3 SUBDIR+= sot-torque-control SUBDIR+= soth SUBDIR+= spark-genom diff --git a/py-sot-tools-v3/DESCR b/py-sot-tools-v3/DESCR index 22f3818c4e704d179e964d217a8766032236311d..816486c407e70a82877e00b5c769b03930f9775a 100644 --- a/py-sot-tools-v3/DESCR +++ b/py-sot-tools-v3/DESCR @@ -1 +1 @@ -Python tools for motion/sot-core package +Python tools for wip/sot-core-v3 package diff --git a/py-sot-tools-v3/Makefile b/py-sot-tools-v3/Makefile index e3846869cdf55c634970d32c8444660462a06f09..52ff647254525057466afb8ef96701728f0fbcb8 100644 --- a/py-sot-tools-v3/Makefile +++ b/py-sot-tools-v3/Makefile @@ -1,13 +1,16 @@ -# robotpkg Makefile for: motion/py-sot-tools +# robotpkg Makefile for: wip/py-sot-tools-v3 # Created: Olivier Stasse on Mon, 15 Apr 2013 # -VERSION= 2.0.2 -DISTNAME= sot-tools-v3-${VERSION} -PKGNAME= ${PKGTAG.python-}sot-tools-v3-${VERSION} +ORG= stack-of-tasks +NAME= sot-tools +VERSION= 2.0.3 -MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=sot-tools-v3/} -MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/stack-of-tasks/sot-tools +DISTNAME= ${NAME}-${VERSION} +PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION} + +MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}-v3/} +MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}.git CHECKOUT_VCS_OPTS+= --recursive MAINTAINER= gepetto@laas.fr @@ -17,12 +20,7 @@ COMMENT= Python tools for wip/sot-core-v3 package CONFLICTS+= py[0-9][0-9]-sot-tools-v3-[0-9]* CONFLICTS+= py[0-9][0-9]-sot-tools-[0-9]* -DYNAMIC_PLIST_DIRS+= share/doc/sot-tools - -CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON} -CMAKE_ARGS+= -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE} -CMAKE_ARGS+= -DPYTHON_LIBRARY=${PYTHON_LIB} -CMAKE_ARGS+= -DPYTHON_SITELIB=${PYTHON_SITELIB} +DYNAMIC_PLIST_DIRS+= share/doc/${NAME} CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib @@ -33,11 +31,12 @@ CMAKE_ARGS+= -DCXX_DISABLE_WERROR=yes DEPEND_ABI.python+= python<3 include ../../wip/sot-core-v3/depend.mk +#include ../../wip/py-sot-core-v3/depend.mk TODO +include ../../wip/sot-tools-v3/depend.mk include ../../pkgtools/pkg-config/depend.mk include ../../mk/sysdep/cmake.mk include ../../mk/sysdep/doxygen.mk include ../../mk/sysdep/graphviz.mk -include ../../mk/sysdep/pdflatex.mk include ../../mk/sysdep/python.mk include ../../mk/sysdep/py-numpy.mk include ../../mk/sysdep/py-sphinx.mk diff --git a/py-sot-tools-v3/PLIST b/py-sot-tools-v3/PLIST index e845ed47eb0dc54b82bd671b29e14d6e0f6acb61..f78955db91c9c7b929f00551235cb956fb60ed0b 100644 --- a/py-sot-tools-v3/PLIST +++ b/py-sot-tools-v3/PLIST @@ -1,11 +1,5 @@ @comment Wed Jun 29 12:35:43 CEST 2016 -lib/libsot-tools.so -lib/libsot-tools.so.${PKGVERSION} -lib/pkgconfig/sot-tools.pc ${PYTHON_SITELIB}/dynamic_graph/sot/tools/__init__.py ${PYTHON_SITELIB}/dynamic_graph/sot/tools/quaternion.py ${PYTHON_SITELIB}/dynamic_graph/sot/tools/se3.py ${PYTHON_SITELIB}/dynamic_graph/sot/tools/wrap.so -include/sot/tools/config.hh -include/sot/tools/deprecated.hh -include/sot/tools/warning.hh diff --git a/py-sot-tools-v3/depend.mk b/py-sot-tools-v3/depend.mk index 4d73129990d5141f37de826df2046d2c1e38a28f..35c6c1dd24ec4f5bd9c1ee8c3417984289bcc9f6 100644 --- a/py-sot-tools-v3/depend.mk +++ b/py-sot-tools-v3/depend.mk @@ -1,4 +1,4 @@ -# robotpkg depend.mk for: motion/py-sot-tools +# robotpkg depend.mk for: wip/py-sot-tools-v3 # Created: Olivier Stasse on Mon, 15 Apr 2013 # @@ -18,9 +18,6 @@ DEPEND_ABI.py-sot-tools-v3?= ${PKGTAG.python-}sot-tools-v3>=2.0 DEPEND_DIR.py-sot-tools-v3?= ../../wip/py-sot-tools-v3 SYSTEM_SEARCH.py-sot-tools-v3=\ - include/sot/tools/config.hh \ - lib/libsot-tools.so \ - 'lib/pkgconfig/sot-tools.pc:/Version/s/[^0-9.]//gp' \ '${PYTHON_SYSLIBSEARCH}/dynamic_graph/sot/tools/__init__.py' include ../../mk/sysdep/python.mk diff --git a/py-sot-tools-v3/distinfo b/py-sot-tools-v3/distinfo index 813a47ac959f19a934d42d527da46f61585785db..c725824421534c38d899b65bea8711f46d27871e 100644 --- a/py-sot-tools-v3/distinfo +++ b/py-sot-tools-v3/distinfo @@ -1,3 +1,3 @@ -SHA1 (sot-tools-v3-2.0.2.tar.gz) = 87920c7fb95f842517203467569efa6ffd0e836f -RMD160 (sot-tools-v3-2.0.2.tar.gz) = 5b9fd9f40ee76a3bb1f9cc7d3fc1104c9399d0a5 -Size (sot-tools-v3-2.0.2.tar.gz) = 759050 bytes +SHA1 (sot-tools-2.0.3.tar.gz) = 79e8d8cafe46dd6f0ac2d2b1359bd7f4a71876b6 +RMD160 (sot-tools-2.0.3.tar.gz) = 94bf65858d95f43fa489361c1d8e5156fbb10ba2 +Size (sot-tools-2.0.3.tar.gz) = 781844 bytes diff --git a/sot-tools-v3/DESCR b/sot-tools-v3/DESCR new file mode 100644 index 0000000000000000000000000000000000000000..261f6d7907730e92abc7874fcf6e694d480cda88 --- /dev/null +++ b/sot-tools-v3/DESCR @@ -0,0 +1 @@ +tools for wip/sot-core-v3 package diff --git a/sot-tools-v3/Makefile b/sot-tools-v3/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..d074481a047b50e53b181cd44011469f6cb7fe9e --- /dev/null +++ b/sot-tools-v3/Makefile @@ -0,0 +1,39 @@ +# robotpkg Makefile for: wip/sot-tools-v3 +# Created: Guilhem Saurel on Mon, 1 Aug 2018 +# + +ORG= stack-of-tasks +NAME= sot-tools +VERSION= 2.0.3 + +DISTNAME= ${NAME}-${VERSION} +PKGNAME= ${NAME}-v3-${VERSION} + +MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}-v3/} +MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}.git +CHECKOUT_VCS_OPTS+= --recursive + +MAINTAINER= gepetto@laas.fr +CATEGORIES= wip +LICENSE= gnu-lgpl-v3 +COMMENT= tools for wip/sot-core-v3 package + +CONFLICTS+= sot-tools-v3-[0-9]* +CONFLICTS+= sot-tools-[0-9]* +DYNAMIC_PLIST_DIRS+= share/doc/${NAME} + +CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib +CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF + +# disable -Werror, some warnings from boost-filesystem (1.50, netbsd) cannot be +# fixed here +CMAKE_ARGS+= -DCXX_DISABLE_WERROR=yes + +include ../../wip/sot-core-v3/depend.mk +include ../../pkgtools/pkg-config/depend.mk +include ../../mk/sysdep/cmake.mk +include ../../mk/sysdep/doxygen.mk +include ../../mk/sysdep/graphviz.mk +include ../../mk/language/c.mk +include ../../mk/language/c++.mk +include ../../mk/robotpkg.mk diff --git a/sot-tools-v3/PLIST b/sot-tools-v3/PLIST new file mode 100644 index 0000000000000000000000000000000000000000..76e64a2efad53623a19c6b21d0eae8d13baa1f61 --- /dev/null +++ b/sot-tools-v3/PLIST @@ -0,0 +1,7 @@ +@comment Wed Aug 1 19:27:26 CEST 2018 +include/sot/tools/config.hh +include/sot/tools/deprecated.hh +include/sot/tools/warning.hh +lib/libsot-tools.so +lib/libsot-tools.so.${PKGVERSION} +lib/pkgconfig/sot-tools.pc diff --git a/sot-tools-v3/depend.mk b/sot-tools-v3/depend.mk new file mode 100644 index 0000000000000000000000000000000000000000..7ce1a0cbc0858c34f14a216899eb11463d373d74 --- /dev/null +++ b/sot-tools-v3/depend.mk @@ -0,0 +1,27 @@ +# robotpkg depend.mk for: wip/sot-tools-v3 +# Created: Guilhem Saurel on Wed, 1 Aug 2018 +# + +DEPEND_DEPTH:= ${DEPEND_DEPTH}+ +SOT_TOOLS_V3_DEPEND_MK:= ${SOT_TOOLS_V3_DEPEND_MK}+ + +ifeq (+,$(DEPEND_DEPTH)) +DEPEND_PKG+= sot-tools-v3 +endif + +ifeq (+,$(SOT_TOOLS_V3_DEPEND_MK)) # ----------------------------------- + +PREFER.sot-tools-v3?= robotpkg + +DEPEND_USE+= sot-tools-v3 +DEPEND_ABI.sot-tools-v3?= sot-tools-v3>=2.0 +DEPEND_DIR.sot-tools-v3?= ../../wip/sot-tools-v3 + +SYSTEM_SEARCH.sot-tools-v3=\ + include/sot/tools/config.hh \ + lib/libsot-tools.so \ + 'lib/pkgconfig/sot-tools.pc:/Version/s/[^0-9.]//gp' + +endif # SOT_TOOLS_DEPEND_MK ----------------------------------------- + +DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/sot-tools-v3/distinfo b/sot-tools-v3/distinfo new file mode 100644 index 0000000000000000000000000000000000000000..c725824421534c38d899b65bea8711f46d27871e --- /dev/null +++ b/sot-tools-v3/distinfo @@ -0,0 +1,3 @@ +SHA1 (sot-tools-2.0.3.tar.gz) = 79e8d8cafe46dd6f0ac2d2b1359bd7f4a71876b6 +RMD160 (sot-tools-2.0.3.tar.gz) = 94bf65858d95f43fa489361c1d8e5156fbb10ba2 +Size (sot-tools-2.0.3.tar.gz) = 781844 bytes