Merge branch 'master' of git+ssh://softs.laas.fr/git/jrl/frameworks/dynamicGraph

.mailmap

+#
+# This list is used by git-shortlog to fix a few botched name translations
+# in the git archive, either because the author's full name was messed up
+# and/or not always written the same way, making contributions from the
+# same person appearing not to be so or badly displayed.
+
+Anthony Mallet <anthony.mallet@laas.fr>
+
+Olivier Stasse <grxuser@jrl005.a01.aist.go.jp>
+Olivier Stasse <olivier.stasse@aist.go.jp>
+Olivier Stasse <stasse@dhcpt1243.a02.aist.go.jp>
+Olivier Stasse <stasse@jrl005.a01.aist.go.jp>
+Olivier Stasse <olivier.stasse@aist.go.jp>
+Olivier Stasse <stasse@stasse-laptop.(none)>
+Olivier Stasse <olivier.stasse@aist.go.jp>
+Olivier Stasse <stasse@dhcpt1059.a02.aist.go.jp>
+Olivier Stasse <stasse@jrl005.a01.aist.go.jp>
+Olivier Stasse <stasse@jrl005.a02.aist.go.jp>
+Olivier Stasse <olivier.stasse@aist.go.jp>
+Olivier Stasse <stasse@jrl006.(none)>
+Olivier Stasse <stasse@stasse-laptop.(none)>
+
+
+Nicolas Mansard <nmansard@devgiri.(none)>
+Nicolas Mansard <nmansard@jorasse.(none)>
+Nicolas Mansard <nmansard@laas.fr>
+
+
+Florent Lamiraux <florent@big-laptop.(none)>
+Florent Lamiraux <florent@dhcpt1253.a02.aist.go.jp>
+Florent Lamiraux <florent@florent-laptop.laas.fr>
+Florent Lamiraux <florent@florent-laptop.(none)>
+Florent Lamiraux <florent@laas.fr>
+Florent Lamiraux <Florent Lamiraux florent@laas.fr>
+Florent Lamiraux <florent@florent-laptop.(none)>
+Florent Lamiraux <Florent Lamiraux florent@laas.fr>
+Florent Lamiraux <florent@localhost.localdomain>
+Florent Lamiraux <florent@poullenc.laas.fr>
+Florent Lamiraux <florent@poullenc.(none)>

debian/control

@@ -4,6 +4,7 @@ Maintainer: Thomas Moulard <thomas.moulard@gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), cmake (>= 2.6),
 	       doxygen (>= 1.6.3),
 	       pkg-config (>= 0.22),
+	       perl (>= 5.10.1),
 	       libboost-dev (>= 1.33.1),
 	       libboost-thread-dev (>= 1.33.1)
 Standards-Version: 3.8.4

debian/libdynamic-graph1.0.0.99.install

 usr/bin/*
 usr/lib/*.so.*
 usr/lib/plugin/*.so
+usr/share/man/*

doc/CMakeLists.txt

-# 
-#  Copyright 
-# 
+# Copyright 2010, Olivier Stasse, JRL, CNRS/AIST
+#
+# This file is part of dynamic-graph.
+# dynamic-graph is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# dynamic-graph is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Lesser Public License for more details.  You should have
+# received a copy of the GNU Lesser General Public License along with
+# dynamic-graph. If not, see <http://www.gnu.org/licenses/>.
 
-# Configure package.dox file
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/package.dox.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/package.dox
-)
+# MANPAGE
+# -------
+#
+# Generate a pod man page from a template, then
+# generate the man page and compress it.
+# This macro also adds the installation rules.
+#
+MACRO(MANPAGE NAME)
+  FIND_PROGRAM(POD2MAN pod2man)
+  CONFIGURE_FILE(${NAME}.pod.in ${NAME}.pod @ONLY)
 
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${NAME}.1
+    COMMAND ${POD2MAN} --section=1
+            --center="LOCAL USER COMMANDS"
+	    --release ${PROJECT_NAME} ${NAME}.pod
+	    > ${NAME}.1
+    DEPENDS ${BUILD_DIR}/${NAME}.pod)
 
-ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/index.html
-  COMMAND ${DOXYGEN_EXECUTABLE} \"${CMAKE_CURRENT_BINARY_DIR}/package.dox\"
-)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${NAME}.1.gz
+    COMMAND gzip -c ${NAME}.1 > ${NAME}.1.gz
+    DEPENDS ${BUILD_DIR}/${NAME}.1)
+  INSTALL(FILES ${BUILD_DIR}/${NAME}.1.gz DESTINATION share/man/man1)
+ENDMACRO(MANPAGE)
 
-ADD_CUSTOM_TARGET(documentation ALL
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/index.html)
 
-#
-# Install html documentation
-#
 
-# html files
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-  DESTINATION share/doc/dynamic-graph)
+SET(BUILD_DIR ${CMAKE_BINARY_DIR}/doc)
+
+SET(DOCDIR share/doc/${PROJECT_NAME})
+SET(HTMLDIR ${DOCDIR}/html)
+
+# Add `doc' target.
+ADD_CUSTOM_TARGET(
+  doc ALL
+  DEPENDS html/index.html dg-shell.1.gz dg-shell-plugin.1.gz)
+
+
+# Generate Doxygen configuration file.
+CONFIGURE_FILE(package.dox.cmake package.dox)
+
+# Generating the Doxygen documentation
+ADD_CUSTOM_COMMAND(
+  OUTPUT html/index.html
+  COMMAND ${DOXYGEN_EXECUTABLE} package.dox
+  COMMENT Generating Doxygen documentation
+)
+
+# Doxygen documentation installation rules.
+INSTALL(DIRECTORY ${BUILD_DIR}/html DESTINATION ${DOCDIR})
+INSTALL(FILES ${BUILD_DIR}/${PROJECT_NAME}.doxytag DESTINATION ${HTMLDIR})
+INSTALL(DIRECTORY pictures DESTINATION ${HTMLDIR})
 
-# doxytag
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.doxytag
-  DESTINATION share/doc/dynamic-graph/html)
 
-# pictures
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pictures
-  DESTINATION share/doc/dynamic-graph/html)
+# Man page generation.
+MANPAGE(dg-shell)
+MANPAGE(dg-shell-plugin)

doc/dg-shell-plugin.pod.in

+=head1 NAME
+
+dg-shell-plugin - Stack of tasks shell with all plug-ins loaded
+
+
+=head1 SYNOPSIS
+
+dg-shell-plugin
+
+
+=head1 DESCRIPTION
+
+Start the stack of tasks with all core plug-ins loaded.
+
+=head1 AUTHORS
+
+This software has been developed at CNRS/AIST and LAAS-CNRS laboratories.
+
+See <@CMAKE_INSTALL_PREFIX@/share/doc/libdg-middleware-dev/AUTHORS> to
+see the list of all contributors.
+
+
+=head1 SEE ALSO
+       dg-shell(1)
+
+See also <@PROJECT_URL@> for additional resources.

doc/dg-shell.pod.in

+=head1 NAME
+
+dg-shell - Stack of tasks shell
+
+
+=head1 SYNOPSIS
+
+dg-shell [FILE]
+
+
+=head1 DESCRIPTION
+
+Start the stack of tasks and provides to the user an interactive shell
+to control the data-flow.
+
+Optionally, a file which will be interpreted at start-up can be given
+to the program.
+
+
+=head1 AUTHORS
+
+This software has been developed at CNRS/AIST and LAAS-CNRS laboratories.
+
+See <@CMAKE_INSTALL_PREFIX@/share/doc/libdg-middleware-dev/AUTHORS> to
+see the list of all contributors.
+
+
+=head1 SEE ALSO
+       dg-shell-plugin(1)
+
+See also <@PROJECT_URL@> for additional resources.

tools/CMakeLists.txt

+# Copyright 2010, Olivier Stasse, JRL, CNRS/AIST
 #
-#  Copyright
+# This file is part of dynamic-graph.
+# dynamic-graph is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
 #
-
-### tools
-SET(tools
-	sot-shell
-)
-
-### Configure shell launch script
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/sot-shell-plugin.cmake
-	       ${${PROJECT_NAME}_BINARY_DIR}/tools/sot-shell-plugin)
+# dynamic-graph is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Lesser Public License for more details.  You should have
+# received a copy of the GNU Lesser General Public License along with
+# dynamic-graph. If not, see <http://www.gnu.org/licenses/>.
+
+SET(tools dg-shell)
+
+# Configure shell launch script.
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/dg-shell-plugin.cmake
+	       ${${PROJECT_NAME}_BINARY_DIR}/tools/dg-shell-plugin)
 INSTALL(
 	FILES
-		${${PROJECT_NAME}_BINARY_DIR}/tools/sot-shell-plugin
+		${${PROJECT_NAME}_BINARY_DIR}/tools/dg-shell-plugin
 	DESTINATION
 		 bin
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
-                      GROUP_EXECUTE GROUP_READ )
+                      GROUP_EXECUTE GROUP_READ)
 
 FOREACH(tool_name ${tools})
 	SET(EXECUTABLE_NAME ${tool_name})

tools/sot-shell-plugin.cmake → tools/dg-shell-plugin.cmake

@@ -3,4 +3,4 @@ tmp=`mktemp`
 echo "-- Launching dynamic-graph C shell with default plugins"
 echo "loadPlugin ${CMAKE_INSTALL_PREFIX}/lib/plugin/shell-functions.so" > $tmp
 echo "loadPlugin ${CMAKE_INSTALL_PREFIX}/lib/plugin/shell-procedure.so" >> $tmp
-${CMAKE_INSTALL_PREFIX}/bin/sot-shell $tmp
+${CMAKE_INSTALL_PREFIX}/bin/dg-shell $tmp