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

[wip/py-sot-tools-v3] Update to v2.1.1

Packaging changes:
- add patches ab, ad from py-pinocchio
- add patch aa to avoid installing lib from main package
parent af07c60f
No related branches found
No related tags found
No related merge requests found
......@@ -4,11 +4,10 @@
ORG= stack-of-tasks
NAME= sot-tools
VERSION= 2.1.0
VERSION= 2.1.1
DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
PKGREVISION= 1
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}
......
SHA1 (sot-tools-2.1.0.tar.gz) = 2dece4ca732f3985859de73780af30f20b9d23e9
RMD160 (sot-tools-2.1.0.tar.gz) = 79ba16219d6bd1ae1d2475ac88a8d0a189a4dacf
Size (sot-tools-2.1.0.tar.gz) = 784202 bytes
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
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)
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()
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