From 79c96e927be7ab804c0e25f5b4714ce977f70f20 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 29 Oct 2019 16:59:30 +0100
Subject: [PATCH] [wip/{py-,}dynamic-graph-tutorial] Update to v1.2.0
Changes since v1.1.2:
- Python 3 compatibility
- Format
- Update CI
- Add INSTALL_PYTHON_INTERFACE_ONLY CMake option
Packaging Changes:
- use jrl-cmakemodules
---
dynamic-graph-tutorial/Makefile | 12 ++-----
dynamic-graph-tutorial/PLIST | 8 ++---
dynamic-graph-tutorial/depend.mk | 2 +-
dynamic-graph-tutorial/distinfo | 6 ++--
py-dynamic-graph-tutorial/Makefile | 15 ++------
py-dynamic-graph-tutorial/distinfo | 9 ++---
py-dynamic-graph-tutorial/patches/patch-ab | 13 -------
py-dynamic-graph-tutorial/patches/patch-ac | 21 ------------
py-dynamic-graph-tutorial/patches/patch-ad | 40 ----------------------
9 files changed, 16 insertions(+), 110 deletions(-)
delete mode 100644 py-dynamic-graph-tutorial/patches/patch-ab
delete mode 100644 py-dynamic-graph-tutorial/patches/patch-ac
delete mode 100644 py-dynamic-graph-tutorial/patches/patch-ad
diff --git a/dynamic-graph-tutorial/Makefile b/dynamic-graph-tutorial/Makefile
index 59048278..fcfe626e 100644
--- a/dynamic-graph-tutorial/Makefile
+++ b/dynamic-graph-tutorial/Makefile
@@ -4,13 +4,7 @@
ORG= stack-of-tasks
NAME= dynamic-graph-tutorial
-VERSION= 1.1.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.0
CATEGORIES= wip
COMMENT= Tutorial for the dynamic-graph
@@ -18,10 +12,8 @@ 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}
+include ../../devel/jrl-cmakemodules/Makefile.common
include ../../wip/dynamic-graph-v3/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
diff --git a/dynamic-graph-tutorial/PLIST b/dynamic-graph-tutorial/PLIST
index b542b12c..77f1ac42 100644
--- a/dynamic-graph-tutorial/PLIST
+++ b/dynamic-graph-tutorial/PLIST
@@ -1,8 +1,8 @@
-@comment Fri Jul 13 15:58:59 CEST 2018
+@comment Tue Oct 29 16:04:29 CET 2019
+include/dynamic-graph/tutorial/config.hh
+include/dynamic-graph/tutorial/deprecated.hh
include/dynamic-graph/tutorial/feedback-controller.hh
include/dynamic-graph/tutorial/inverted-pendulum.hh
-include/dynamic/graph/tutorial/config.hh
-include/dynamic/graph/tutorial/deprecated.hh
-include/dynamic/graph/tutorial/warning.hh
+include/dynamic-graph/tutorial/warning.hh
lib/libdynamic-graph-tutorial.so
lib/pkgconfig/dynamic-graph-tutorial.pc
diff --git a/dynamic-graph-tutorial/depend.mk b/dynamic-graph-tutorial/depend.mk
index 7f5a7c18..ca1b717f 100644
--- a/dynamic-graph-tutorial/depend.mk
+++ b/dynamic-graph-tutorial/depend.mk
@@ -14,7 +14,7 @@ ifeq (+,$(DYNAMIC_GRAPH_TUTORIAL_DEPEND_MK)) # ---------------------------------
PREFER.dynamic-graph-tutorial?= robotpkg
SYSTEM_SEARCH.dynamic-graph-tutorial=\
- 'include/dynamic/graph/tutorial/config.hh:/DYNAMIC_GRAPH_TUTORIAL_VERSION/s/[^0-9.]//gp' \
+ 'include/dynamic-graph/tutorial/config.hh:/DYNAMIC_GRAPH_TUTORIAL_VERSION/s/[^0-9.]//gp' \
'lib/libdynamic-graph-tutorial.so' \
'lib/pkgconfig/dynamic-graph-tutorial.pc:/Version/s/[^0-9.]//gp'
diff --git a/dynamic-graph-tutorial/distinfo b/dynamic-graph-tutorial/distinfo
index f4e76037..1c5c1618 100644
--- a/dynamic-graph-tutorial/distinfo
+++ b/dynamic-graph-tutorial/distinfo
@@ -1,3 +1,3 @@
-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 (dynamic-graph-tutorial-1.2.0.tar.gz) = 39d1a546c13eff7f2da3a917cf4b75cd7113b48e
+RMD160 (dynamic-graph-tutorial-1.2.0.tar.gz) = 557ea32710dd669c3d57971350a711159b1dbafd
+Size (dynamic-graph-tutorial-1.2.0.tar.gz) = 793699 bytes
diff --git a/py-dynamic-graph-tutorial/Makefile b/py-dynamic-graph-tutorial/Makefile
index b5f4b04b..93927e36 100644
--- a/py-dynamic-graph-tutorial/Makefile
+++ b/py-dynamic-graph-tutorial/Makefile
@@ -4,25 +4,16 @@
ORG= stack-of-tasks
NAME= dynamic-graph-tutorial
-VERSION= 1.1.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.0
CATEGORIES= wip
COMMENT= Tutorial for the dynamic-graph
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
-CMAKE_ARGS+= -DCMAKE_INSTALL_DOCDIR=share/doc/${PKGBASE}
-
-DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
-DYNAMIC_PLIST_DIRS+= share/doc/${PKGTAG.python-}${NAME}
+USE_PYTHON_ONLY= true
+include ../../devel/jrl-cmakemodules/Makefile.common
include ../../wip/${NAME}/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk
include ../../wip/py-dynamic-graph-v3/depend.mk
diff --git a/py-dynamic-graph-tutorial/distinfo b/py-dynamic-graph-tutorial/distinfo
index 94b0254a..1c5c1618 100644
--- a/py-dynamic-graph-tutorial/distinfo
+++ b/py-dynamic-graph-tutorial/distinfo
@@ -1,6 +1,3 @@
-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
+SHA1 (dynamic-graph-tutorial-1.2.0.tar.gz) = 39d1a546c13eff7f2da3a917cf4b75cd7113b48e
+RMD160 (dynamic-graph-tutorial-1.2.0.tar.gz) = 557ea32710dd669c3d57971350a711159b1dbafd
+Size (dynamic-graph-tutorial-1.2.0.tar.gz) = 793699 bytes
diff --git a/py-dynamic-graph-tutorial/patches/patch-ab b/py-dynamic-graph-tutorial/patches/patch-ab
deleted file mode 100644
index cc269d9e..00000000
--- a/py-dynamic-graph-tutorial/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't install the .pc file, which is already installed by dynamic-graph-tutorial
-
---- 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()
diff --git a/py-dynamic-graph-tutorial/patches/patch-ac b/py-dynamic-graph-tutorial/patches/patch-ac
deleted file mode 100644
index 67f1126b..00000000
--- a/py-dynamic-graph-tutorial/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-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)
diff --git a/py-dynamic-graph-tutorial/patches/patch-ad b/py-dynamic-graph-tutorial/patches/patch-ad
deleted file mode 100644
index 83ef8fe0..00000000
--- a/py-dynamic-graph-tutorial/patches/patch-ad
+++ /dev/null
@@ -1,40 +0,0 @@
-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)
-
-
--
GitLab