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

[wip/{py-,}parametric-curves] Update to v1.2.3

Changes since v1.2.2:
- [CMake] sync submodule
- [CMake] add option INSTALL_PYTHON_INTERFACE_ONLY
- [Python][Test] use unittest
- Format

Packaging changes:
- use devel/jrl-cmakemodules
parent debfe4fa
No related branches found
No related tags found
No related merge requests found
......@@ -4,13 +4,7 @@
ORG= stack-of-tasks
NAME= parametric-curves
VERSION= 1.2.2
DISTNAME= ${NAME}-${VERSION}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
VERSION= 1.2.3
CATEGORIES= wip
COMMENT= This packages provides a template based parametric curves library.
......@@ -18,12 +12,10 @@ LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
DEPEND_ABI.eigen3 += eigen3>=3.2.92
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../math/eigen3/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
......
SHA1 (parametric-curves-1.2.2.tar.gz) = f4aa3a70a33810975ffe170e622f8504261c6cc5
RMD160 (parametric-curves-1.2.2.tar.gz) = 7dc733c3288ebe90a958af2fdb0749b126fc4cdd
Size (parametric-curves-1.2.2.tar.gz) = 829043 bytes
SHA1 (parametric-curves-1.2.3.tar.gz) = b88b6b37f08084e31f67c105fafdbf8fe36464f2
RMD160 (parametric-curves-1.2.3.tar.gz) = 7f2bcfde1e582b3c6c9e106763986d07035b659e
Size (parametric-curves-1.2.3.tar.gz) = 829021 bytes
......@@ -4,23 +4,17 @@
ORG= stack-of-tasks
NAME= parametric-curves
VERSION= 1.2.2
DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${DISTNAME}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}
CHECKOUT_VCS_OPTS+= --recursive
VERSION= 1.2.3
CATEGORIES= wip
COMMENT= This packages provides a template based parametric curves library (python bindings)
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
USE_PYTHON_ONLY= true
include ../../${CATEGORIES}/${NAME}/depend.mk
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../math/py-eigenpy/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
......
SHA1 (parametric-curves-1.2.2.tar.gz) = f4aa3a70a33810975ffe170e622f8504261c6cc5
RMD160 (parametric-curves-1.2.2.tar.gz) = 7dc733c3288ebe90a958af2fdb0749b126fc4cdd
Size (parametric-curves-1.2.2.tar.gz) = 829043 bytes
SHA1 (patch-aa) = cdfac3481c3e890ae2f13a992da2255ee6594b69
SHA1 (patch-ab) = 7a8139a588b31241f9c533a000546cc89a7d1278
SHA1 (patch-ad) = 9731f90f2c33abec026a1d34cfaa653316b84427
SHA1 (parametric-curves-1.2.3.tar.gz) = b88b6b37f08084e31f67c105fafdbf8fe36464f2
RMD160 (parametric-curves-1.2.3.tar.gz) = 7f2bcfde1e582b3c6c9e106763986d07035b659e
Size (parametric-curves-1.2.3.tar.gz) = 829021 bytes
don't install main headers
--- CMakeLists.txt.orig 2019-03-05 14:16:01.000000000 +0100
+++ CMakeLists.txt 2019-03-05 14:40:34.854771244 +0100
@@ -43,7 +43,6 @@
ADD_SUBDIRECTORY(python)
ENDIF(BUILD_PYTHON_INTERFACE)
-ADD_SUBDIRECTORY (include/${PROJECT_NAME})
ADD_SUBDIRECTORY (src/tests/spline_test)
ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})
Don't install the .pc file, which is already installed by the main project
--- cmake/base.cmake.orig 2018-07-11 10:41:37.000000000 +0200
+++ cmake/base.cmake 2018-12-13 14:15:46.772836002 +0100
@@ -226,7 +226,7 @@
# finalize the project setup.
#
MACRO(SETUP_PROJECT_FINALIZE)
- _SETUP_PROJECT_PKG_CONFIG_FINALIZE()
+ #_SETUP_PROJECT_PKG_CONFIG_FINALIZE()
_SETUP_PROJECT_DOCUMENTATION_FINALIZE()
_SETUP_PROJECT_HEADER_FINAlIZE()
_SETUP_DEBIAN()
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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment