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

[wip/py-dynamic-graph-tutorial] Update to v1.1.2

Changes since v1.1.1:
- cmake details
- license details
- readme details

Packaging changes:
- removed patch aa, applied upstream
- added patches ab, ad from py-pinocchio
- added patch ac, to avoid installing main headers and libs
parent 61633cd3
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,7 @@
ORG= stack-of-tasks
NAME= dynamic-graph-tutorial
VERSION= 1.1.1
VERSION= 1.1.2
DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${DISTNAME}
......@@ -20,7 +20,8 @@ MAINTAINER= gepetto-soft@laas.fr
CMAKE_ARGS+= -DCMAKE_INSTALL_DOCDIR=share/doc/${PKGBASE}
DYNAMIC_PLIST_DIRS+= share/doc/${PKGBASE}
DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
DYNAMIC_PLIST_DIRS+= share/doc/${PKGTAG.python-}${NAME}
include ../../wip/${NAME}/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk
......
@comment Fri Jul 13 19:35:14 CEST 2018
@comment Tue Mar 5 10:22:33 CET 2019
${PYTHON_SITELIB}/dynamic_graph/tutorial/__init__.py
${PYTHON_SITELIB}/dynamic_graph/tutorial/simu.py
${PYTHON_SITELIB}/dynamic_graph/tutorial/wrap.so
SHA1 (dynamic-graph-tutorial-1.1.1.tar.gz) = 45b23da4ad9fbac1e3eb5fe097c145b7d5079794
RMD160 (dynamic-graph-tutorial-1.1.1.tar.gz) = 50c7accf6656b54162f642398ce76f886cefcf98
Size (dynamic-graph-tutorial-1.1.1.tar.gz) = 773815 bytes
SHA1 (patch-aa) = c64971cf8d1c18b3e0224dd58b40f97c1cd24e6f
SHA1 (dynamic-graph-tutorial-1.1.2.tar.gz) = 15838011164852d817fd486699b53abd51c7fb00
RMD160 (dynamic-graph-tutorial-1.1.2.tar.gz) = bf0a625881e5be7ba551358d493cc6b01d4a2de8
Size (dynamic-graph-tutorial-1.1.2.tar.gz) = 790591 bytes
SHA1 (patch-ab) = fc473d24ad8e05f11bd908d2274adc685f817456
SHA1 (patch-ac) = 67eb3cad8ba459816da720ce7d57d32ad284ad49
SHA1 (patch-ad) = 9731f90f2c33abec026a1d34cfaa653316b84427
[Doc][Sphinx] Use imgmath with sphinx >= 1.4, as pngmath has been removed in 1.8
--- doc/sphinx/conf.py.in
+++ doc/sphinx/conf.py.in
@@ -19,13 +19,14 @@ import sys, os
sys.path = [os.path.abspath('@CMAKE_BINARY_DIR@/src')]+sys.path
sys.path = [os.path.abspath('@CMAKE_SOURCE_DIR@/src')]+sys.path
-import dynamic_graph.tutorial as dgt
+from sphinx import version_info as sphinx_version
# -- General configuration -----------------------------------------------------
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.pngmath']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo']
+extensions.append('sphinx.ext.pngmath' if sphinx_version < (1, 4) else 'sphinx.ext.imgmath')
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
don't install stuff already installed by main package
--- include/dynamic-graph/tutorial/CMakeLists.txt.orig 2019-03-05 11:45:18.000000000 +0100
+++ include/dynamic-graph/tutorial/CMakeLists.txt 2019-03-05 13:40:33.556184874 +0100
@@ -2,8 +2,3 @@
inverted-pendulum.hh
feedback-controller.hh
)
-
-INSTALL(FILES
- ${${PROJECT_NAME}_HEADERS}
- DESTINATION include/dynamic-graph/tutorial/
- )
--- src/CMakeLists.txt.orig 2019-03-05 11:45:18.000000000 +0100
+++ src/CMakeLists.txt 2019-03-05 13:41:15.188967955 +0100
@@ -19,5 +19,3 @@
DYNAMIC_GRAPH_PYTHON_MODULE("tutorial" ${PROJECT_NAME} wrap)
INSTALL(FILES ${${PY_NAME}_PYTHON} DESTINATION "${PYTHON_SITELIB}/dynamic_graph/tutorial/")
ENDIF(BUILD_PYTHON_INTERFACE)
-
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
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