From 66c0439002ba2ea4ac9380df4d11a17f5224d2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9verin=20Lemaignan?= <severin.lemaignan@laas.fr> Date: Tue, 4 Jan 2011 14:51:57 +0100 Subject: [PATCH] [wip/morse] Jumped to morse-0.2 beta 1 Changelog: - added head and hand control to human - fixed several issues with camera calibration in Blender - Added Jido robot model with Kuka arm - Access to armature joint angle now possible - redid human rig and animation - On-going switch to reStructured text for the documentation - Support for Ubuntu 10.04 (hi Lorenz!) - Added several posters for Genom middleware - Fixed the accelerometer sensor - fixed several issues with transformation coordinates + other minor fix, documentation updates, etc. --- morse/Makefile | 22 +++++++++++----------- morse/depend.mk | 2 +- morse/distinfo | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/morse/Makefile b/morse/Makefile index 2d5ba2f6..6e96f581 100644 --- a/morse/Makefile +++ b/morse/Makefile @@ -17,8 +17,8 @@ # Severin Lemaignan on Fri May 28 2010 # -DISTNAME= morse-0.1 -MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=} +DISTNAME= morse-0.2b1 +MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=morse/} MASTER_REPOSITORY= git ssh://trac.laas.fr/git/robots/morse CATEGORIES= wip @@ -27,7 +27,7 @@ HOMEPAGE= http://softs.laas.fr COMMENT= A 3D simulator for robotics LICENSE= modified-bsd -USE_LANGUAGES+= c c++ python +USE_LANGUAGES+= c c++ BUILD_TARGET= all INSTALL_TARGET= install @@ -63,14 +63,14 @@ define PKG_OPTION_SET.pocolibs include ../../localization/pom-genom/depend.mk endef -# build examples option -PKG_SUPPORTED_OPTIONS+= examples -PKG_SUGGESTED_OPTIONS+= examples -PKG_OPTION_DESCR.examples?= Build and install scenarii examples - -define PKG_OPTION_SET.examples - CMAKE_ARGS+= -DBUILD_EXAMPLES=ON -endef +# build examples option -- OPTION DOES NOT EXIST ANYMORE IN THE CMAKELISTS +#PKG_SUPPORTED_OPTIONS+= examples +#PKG_SUGGESTED_OPTIONS+= examples +#PKG_OPTION_DESCR.examples?= Build and install scenarii examples +# +#define PKG_OPTION_SET.examples +# CMAKE_ARGS+= -DBUILD_EXAMPLES=ON +#endef include ../../mk/sysdep/cmake.mk include ../../mk/sysdep/blender.mk diff --git a/morse/depend.mk b/morse/depend.mk index e486dd67..18a5933b 100644 --- a/morse/depend.mk +++ b/morse/depend.mk @@ -34,7 +34,7 @@ SYSTEM_SEARCH.morse=\ DEPEND_USE+= morse -DEPEND_ABI.morse?= morse>=0.1 +DEPEND_ABI.morse?= morse>=0.2b1 DEPEND_DIR.morse?= ../../wip/morse endif # MORSE_DEPEND_MK --------------------------------------------------- diff --git a/morse/distinfo b/morse/distinfo index fa263261..9011b6b8 100644 --- a/morse/distinfo +++ b/morse/distinfo @@ -1,3 +1,3 @@ -SHA1 (morse-0.1.tar.gz) = 1e7951b7d5c73bd1723e84e4deb6bd9124636307 -RMD160 (morse-0.1.tar.gz) = 6e4f7058c5a84650ba18d6e4f1087b2efd7af782 -Size (morse-0.1.tar.gz) = 27644677 bytes +SHA1 (morse-0.2b1.tar.gz) = 440dee1cf4d270722eabc76f55746a03c399fc90 +RMD160 (morse-0.2b1.tar.gz) = ee78dac1ad88d339f4de473da1b6291db5dc5761 +Size (morse-0.2b1.tar.gz) = 36787788 bytes -- GitLab