diff --git a/py-sot-application-v3/Makefile b/py-sot-application-v3/Makefile index b50fe0f9c0376e0549c4ad6c1d6c6c2552f82ff8..8ccff4f85f57b2bb36345efd7fbb1c670f113b16 100644 --- a/py-sot-application-v3/Makefile +++ b/py-sot-application-v3/Makefile @@ -4,16 +4,10 @@ ORG= stack-of-tasks NAME= sot-application -VERSION= 1.2.0 -PKGREVISION= 2 +VERSION= 1.2.2 -DISTNAME= ${NAME}-${VERSION} PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION} -MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/} -MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git -CHECKOUT_VCS_OPTS+= --recursive - CATEGORIES= wip COMMENT= Application dependent control graph initialization scripts for the Stack of Tasks LICENSE= gnu-lgpl-v3 @@ -21,10 +15,7 @@ MAINTAINER= gepetto@laas.fr CONFLICTS+= py[0-9][0-9]-${NAME} -DYNAMIC_PLIST_DIRS+= share/doc/${NAME} - -CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib - +include ../../devel/jrl-cmakemodules/Makefile.common include ../../wip/sot-dynamic-pinocchio-v3/depend.mk include ../../wip/py-sot-dynamic-pinocchio-v3/depend.mk #include ../../wip/sot-dyninv-v3/depend.mk diff --git a/py-sot-application-v3/PLIST b/py-sot-application-v3/PLIST index 32c21186ead879cc5ec19216eb03469ee9adca79..edab0e48cd2990018729f6058060995b98950f4c 100644 --- a/py-sot-application-v3/PLIST +++ b/py-sot-application-v3/PLIST @@ -1,11 +1,11 @@ @comment Thu Oct 16 12:43:20 CEST 2014 -include/sot/application/warning.hh -include/sot/application/deprecated.hh include/sot/application/config.hh +include/sot/application/deprecated.hh +include/sot/application/warning.hh lib/pkgconfig/sot-application.pc -${PYTHON_SITELIB}/dynamic_graph/sot/application/__init__.py -${PYTHON_SITELIB}/dynamic_graph/sot/application/acceleration/__init__.py -${PYTHON_SITELIB}/dynamic_graph/sot/application/acceleration/precomputed_meta_tasks.py -${PYTHON_SITELIB}/dynamic_graph/sot/application/velocity/__init__.py -${PYTHON_SITELIB}/dynamic_graph/sot/application/velocity/precomputed_meta_tasks.py -${PYTHON_SITELIB}/dynamic_graph/sot/application/velocity/precomputed_tasks.py +${PYTHON_SITELIB}/sot_application/__init__.py +${PYTHON_SITELIB}/sot_application/acceleration/__init__.py +${PYTHON_SITELIB}/sot_application/acceleration/precomputed_meta_tasks.py +${PYTHON_SITELIB}/sot_application/velocity/__init__.py +${PYTHON_SITELIB}/sot_application/velocity/precomputed_meta_tasks.py +${PYTHON_SITELIB}/sot_application/velocity/precomputed_tasks.py diff --git a/py-sot-application-v3/distinfo b/py-sot-application-v3/distinfo index 92c27e4e29331a3f5772fc712f1259a6d0d3c369..17a657253ce284d7004b8c12ccacd272fbf3f310 100644 --- a/py-sot-application-v3/distinfo +++ b/py-sot-application-v3/distinfo @@ -1,3 +1,4 @@ -SHA1 (sot-application-1.2.0.tar.gz) = 575f62c233be775e217910b1bb4c4a7de0eec776 -RMD160 (sot-application-1.2.0.tar.gz) = 8671a8f7f1a670e2b0c5b3f89117492c8bac3d8d -Size (sot-application-1.2.0.tar.gz) = 767025 bytes +SHA1 (sot-application-1.2.2.tar.gz) = bae0cc1e098f8c398689f47e97fb31904832ded2 +RMD160 (sot-application-1.2.2.tar.gz) = cbc6059d9d94cad38e543fc2aa969d7afcbfac35 +Size (sot-application-1.2.2.tar.gz) = 800555 bytes +SHA1 (patch-aa) = 23bf9deb51b58793297047ab669702f727f312e1 diff --git a/py-sot-application-v3/patches/patch-aa b/py-sot-application-v3/patches/patch-aa new file mode 100644 index 0000000000000000000000000000000000000000..9d5ae674e82914ca04fba3c70e0f1dbc51565485 --- /dev/null +++ b/py-sot-application-v3/patches/patch-aa @@ -0,0 +1,7 @@ +--- CMakeLists.txt.orig 2019-11-04 17:34:59.000000000 +0100 ++++ CMakeLists.txt 2019-11-04 17:38:46.641239112 +0100 +@@ -24,4 +24,3 @@ + + # Add subdirectories. + ADD_SUBDIRECTORY(${PY_NAME}) +-ADD_SUBDIRECTORY(doc)