From 978062f5c67d67e29cea92e5369d94b01bd4d219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verin=20Lemaignan?= <severin.lemaignan@laas.fr>
Date: Wed, 23 Feb 2011 10:01:51 +0100
Subject: [PATCH] [wip/morse] Bumped to 0.2.1 - Bugfix release
Changelog:
- Correct the length of the kinematic chain for arms
- Correct function to limit angles to (pi, -pi)
- Correct the rotation of platine relative to robot
- Update to fix the directions of the rays (SICK sensor)
- No longer do the transpose of the rotation matrix (-> Blender 2.5)
- Link gaussian module with the right libpython
- Make sure to use python2 interpreter when calling sphinx-build
- Documentation update in several places
While here, commented unsupported ROS option.
---
morse/Makefile | 17 +++++----
morse/depend.mk | 2 +-
morse/distinfo | 7 ++--
morse/patches/patch-aa | 79 ------------------------------------------
4 files changed, 12 insertions(+), 93 deletions(-)
delete mode 100644 morse/patches/patch-aa
diff --git a/morse/Makefile b/morse/Makefile
index 89f7373b..1ffa4738 100644
--- a/morse/Makefile
+++ b/morse/Makefile
@@ -18,8 +18,7 @@
#
DISTNAME= morse-${VERSION}
-VERSION= 0.2
-PKGREVISION= 1
+VERSION= 0.2.1
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=morse/}
MASTER_REPOSITORY= git ssh://trac.laas.fr/git/robots/morse
@@ -123,13 +122,13 @@ define PKG_OPTION_SET.pocolibs-all
endef
# ROS support (only partial)
-PKG_SUPPORTED_OPTIONS+= ros
-PKG_OPTION_DESCR.ros?= Install support for the ROS middleware
-
-define PKG_OPTION_SET.ros
- CMAKE_ARGS+= -DBUILD_ROS_SUPPORT=ON
- include ../../meta-pkgs/ros-base/depend.mk
-endef
+#PKG_SUPPORTED_OPTIONS+= ros
+#PKG_OPTION_DESCR.ros?= Install support for the ROS middleware
+#
+#define PKG_OPTION_SET.ros
+# CMAKE_ARGS+= -DBUILD_ROS_SUPPORT=ON
+# include ../../meta-pkgs/ros-base/depend.mk
+#endef
DEPEND_ABI.blender= blender>=2.55
diff --git a/morse/depend.mk b/morse/depend.mk
index 18a5933b..c988cd2a 100644
--- a/morse/depend.mk
+++ b/morse/depend.mk
@@ -34,7 +34,7 @@ SYSTEM_SEARCH.morse=\
DEPEND_USE+= morse
-DEPEND_ABI.morse?= morse>=0.2b1
+DEPEND_ABI.morse?= morse>=0.2
DEPEND_DIR.morse?= ../../wip/morse
endif # MORSE_DEPEND_MK ---------------------------------------------------
diff --git a/morse/distinfo b/morse/distinfo
index f1946e62..f65b8842 100644
--- a/morse/distinfo
+++ b/morse/distinfo
@@ -1,4 +1,3 @@
-SHA1 (morse-0.2.tar.gz) = e6b304fb31c75c56c4b2accad1569d8c951992c3
-RMD160 (morse-0.2.tar.gz) = 68c76030e9f2a25e0b9c1535f230c59f30e8a9b1
-Size (morse-0.2.tar.gz) = 33380097 bytes
-SHA1 (patch-aa) = c56ca7ce118e2bfcaa70898034056157b7a1af5a
+SHA1 (morse-0.2.1.tar.gz) = 31032a3e4a86a6b2d828583c30384b158dfb8611
+RMD160 (morse-0.2.1.tar.gz) = d904699702e097cdabfdfc2197045f62d031df2d
+Size (morse-0.2.1.tar.gz) = 34101962 bytes
diff --git a/morse/patches/patch-aa b/morse/patches/patch-aa
deleted file mode 100644
index 2bcfdf41..00000000
--- a/morse/patches/patch-aa
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2119c22..ff43cf0 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -71,37 +71,43 @@ FIND_PROGRAM(SPHINX_BUILD NAMES sphinx-build)
- IF (NOT SPHINX_BUILD)
- MESSAGE(STATUS "Can't find sphinx-build : will not build the documentation")
- ELSE()
-- SET (SPHINX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doc/html)
-- SET (SPHINX_LATEX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doc/tex)
-- ADD_CUSTOM_COMMAND(
-- OUTPUT ${SPHINX_OUTPUT}
-- COMMAND ${SPHINX_BUILD} -b html
-- -c ${CMAKE_CURRENT_BINARY_DIR}/doc
-- ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
-- ${SPHINX_OUTPUT}
-- )
--
-- ADD_CUSTOM_TARGET(doc ALL DEPENDS ${SPHINX_OUTPUT})
--
-- INSTALL(DIRECTORY ${SPHINX_OUTPUT}
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/morse
-- )
--
-- ADD_CUSTOM_TARGET(
-- force_doc
-- COMMAND sphinx-build -b html
-- -c ${CMAKE_CURRENT_BINARY_DIR}/doc/
-- ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
-- ${SPHINX_OUTPUT}
-- )
--
-- ADD_CUSTOM_TARGET(
-- latex_doc
-- COMMAND sphinx-build -b latex
-- -c ${CMAKE_CURRENT_BINARY_DIR}/doc/
-- ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
-- ${SPHINX_LATEX_OUTPUT}
-- )
-+ FIND_PACKAGE(PythonInterp)
-+ IF (NOT PYTHONINTERP_FOUND)
-+ MESSAGE(STATUS "Can't find python2 executable : sphinx-build will not run")
-+ MESSAGE(STATUS "Will not build the documentation")
-+ ELSE()
-+ SET (SPHINX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doc/html)
-+ SET (SPHINX_LATEX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doc/tex)
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${SPHINX_OUTPUT}
-+ COMMAND ${PYTHON_EXECUTABLE} ${SPHINX_BUILD} -b html
-+ -c ${CMAKE_CURRENT_BINARY_DIR}/doc
-+ ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
-+ ${SPHINX_OUTPUT}
-+ )
-+
-+ ADD_CUSTOM_TARGET(doc ALL DEPENDS ${SPHINX_OUTPUT})
-+
-+ INSTALL(DIRECTORY ${SPHINX_OUTPUT}
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/morse
-+ )
-+
-+ ADD_CUSTOM_TARGET(
-+ force_doc
-+ COMMAND ${PYTHON_EXECUTABLE} ${SPHINX_BUILD} -b html
-+ -c ${CMAKE_CURRENT_BINARY_DIR}/doc/
-+ ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
-+ ${SPHINX_OUTPUT}
-+ )
-+
-+ ADD_CUSTOM_TARGET(
-+ latex_doc
-+ COMMAND ${PYTHON_EXECUTABLE} ${SPHINX_BUILD} -b latex
-+ -c ${CMAKE_CURRENT_BINARY_DIR}/doc/
-+ ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
-+ ${SPHINX_LATEX_OUTPUT}
-+ )
-+ ENDIF()
- ENDIF()
-
-
--
GitLab