[wip/{py-,}sot-tools-v3] Update to v2.2.0

Changes since v2.1.1:
- Python 3 Compatibility
- Update CI
- Update CMake
- Format

py-sot-tools-v3/Makefile

@@ -4,15 +4,10 @@
 
 ORG=			stack-of-tasks
 NAME=			sot-tools
-VERSION=		2.1.1
+VERSION=		2.2.0
 
-DISTNAME=		${NAME}-${VERSION}
 PKGNAME=		${PKGTAG.python-}${NAME}-v3-${VERSION}
 
-MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}
-CHECKOUT_VCS_OPTS+=	--recursive
-
 CATEGORIES=		wip
 COMMENT=		tools for the sot-core package (python bindings)
 LICENSE=		2-clause-bsd
@@ -20,11 +15,9 @@ MAINTAINER=		gepetto-soft@laas.fr
 
 CONFLICTS+=		py[0-9][0-9]-${NAME}
 
-CMAKE_ARGS+=		-DCMAKE_INSTALL_LIBDIR=lib
-CMAKE_ARGS+=		-DINSTALL_DOCUMENTATION=OFF  # doxygen segfaults on 14.04
-
-DYNAMIC_PLIST_DIRS+=	share/doc/${NAME}
+USE_PYTHON_ONLY=	true
 
+include ../../devel/jrl-cmakemodules/Makefile.common
 include ../../${CATEGORIES}/${NAME}-v3/depend.mk
 include ../../wip/sot-core-v3/depend.mk
 include ../../wip/py-sot-core-v3/depend.mk

py-sot-tools-v3/distinfo

-SHA1 (sot-tools-2.1.1.tar.gz) = d601b2195c522b299be6513fde50abd3255612b6
-RMD160 (sot-tools-2.1.1.tar.gz) = c563c697edc55cfcaab9b40acb2291bdcaeb3843
-Size (sot-tools-2.1.1.tar.gz) = 795231 bytes
-SHA1 (patch-aa) = 6fc15aa32b1440fead21a83459638f0436df85bf
-SHA1 (patch-ab) = 65531cbbc1ea697e9f4f63f864fd811a99e955ae
-SHA1 (patch-ad) = 9731f90f2c33abec026a1d34cfaa653316b84427
+SHA1 (sot-tools-2.2.0.tar.gz) = 24bba437f50e4e895f4681a3bb288d30489284cd
+RMD160 (sot-tools-2.2.0.tar.gz) = 8f3e58fd22b9f8a52c8b49e9b27e34c74d3395a5
+Size (sot-tools-2.2.0.tar.gz) = 796458 bytes

py-sot-tools-v3/patches/patch-aa

-don't install library from the main package
-
---- src/CMakeLists.txt.orig	2019-03-05 16:26:08.000000000 +0100
-+++ src/CMakeLists.txt	2019-03-05 16:36:01.762324977 +0100
-@@ -26,7 +26,6 @@
-   SOVERSION ${PROJECT_VERSION}
-   INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
- 
--INSTALL (TARGETS ${LIBRARY_NAME} DESTINATION lib)
- 
- IF(BUILD_PYTHON_INTERFACE)
-   DYNAMIC_GRAPH_PYTHON_MODULE ("sot/tools" ${LIBRARY_NAME} wrap)

py-sot-tools-v3/patches/patch-ab

-Don't install main .pc
-
---- cmake/base.cmake~	2017-10-26 15:25:19.000000000 +0200
-+++ cmake/base.cmake	2018-04-26 18:06:07.322011937 +0200
-@@ -226,9 +226,7 @@
- #   finalize the project setup.
- #
- MACRO(SETUP_PROJECT_FINALIZE)
--  _SETUP_PROJECT_PKG_CONFIG_FINALIZE()
-   _SETUP_PROJECT_DOCUMENTATION_FINALIZE()
--  _SETUP_PROJECT_HEADER_FINAlIZE()
-   _SETUP_DEBIAN()
-   # Install data if needed
-   _INSTALL_PROJECT_DATA()

py-sot-tools-v3/patches/patch-ad

-Don't install main headers
-
---- cmake/header.cmake~	2017-10-26 15:25:19.000000000 +0200
-+++ cmake/header.cmake	2018-04-26 18:37:42.582417765 +0200
-@@ -92,11 +92,6 @@
-     ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/deprecated.${PROJECT_CUSTOM_HEADER_EXTENSION}
-     @ONLY
-     )
--  INSTALL(FILES
--    ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/deprecated.${PROJECT_CUSTOM_HEADER_EXTENSION}
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
--    PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
--    )
-   # Generate warning.hh header.
-   CONFIGURE_FILE(
-     ${PROJECT_SOURCE_DIR}/cmake/warning.hh.cmake
-@@ -104,11 +99,6 @@
-     @ONLY
-     )
- 
--  INSTALL(FILES
--    ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/warning.${PROJECT_CUSTOM_HEADER_EXTENSION}
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
--    PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
--    )
- 
- 
-   # Generate config.h header.
-@@ -150,11 +140,6 @@
-     @ONLY
-     )
-   # Install it.
--  INSTALL(FILES
--    ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/${FILENAME}
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
--    PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
--    )
- ENDFUNCTION(GENERATE_CONFIGURATION_HEADER)
- 
- 

sot-tools-v3/Makefile

@@ -4,15 +4,10 @@
 
 ORG=			stack-of-tasks
 NAME=			sot-tools
-VERSION=		2.1.1
+VERSION=		2.2.0
 
-DISTNAME=		${NAME}-${VERSION}
 PKGNAME=		${NAME}-v3-${VERSION}
 
-MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
-CHECKOUT_VCS_OPTS+=	--recursive
-
 CATEGORIES=		wip
 COMMENT=		tools for the sot-core package
 LICENSE=		2-clause-bsd
@@ -21,11 +16,9 @@ MAINTAINER=		gepetto-soft@laas.fr
 CONFLICTS+=		${NAME}
 
 CMAKE_ARGS+=		-DBUILD_PYTHON_INTERFACE=OFF
-CMAKE_ARGS+=		-DCMAKE_INSTALL_LIBDIR=lib
 CMAKE_ARGS+=		-DINSTALL_DOCUMENTATION=OFF  # doxygen segfaults on 14.04
 
-DYNAMIC_PLIST_DIRS+=	share/doc/${NAME}
-
+include ../../devel/jrl-cmakemodules/Makefile.common
 include ../../wip/sot-core-v3/depend.mk
 include ../../wip/dynamic-graph-v3/depend.mk
 include ../../pkgtools/pkg-config/depend.mk

sot-tools-v3/distinfo

-SHA1 (sot-tools-2.1.1.tar.gz) = d601b2195c522b299be6513fde50abd3255612b6
-RMD160 (sot-tools-2.1.1.tar.gz) = c563c697edc55cfcaab9b40acb2291bdcaeb3843
-Size (sot-tools-2.1.1.tar.gz) = 795231 bytes
+SHA1 (sot-tools-2.2.0.tar.gz) = 24bba437f50e4e895f4681a3bb288d30489284cd
+RMD160 (sot-tools-2.2.0.tar.gz) = 8f3e58fd22b9f8a52c8b49e9b27e34c74d3395a5
+Size (sot-tools-2.2.0.tar.gz) = 796458 bytes