Menu
▾
▴
robotflow-cvs — CVS changes are sent to this mailing list.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(59) |
Jun
(40) |
Jul
(59) |
Aug
(81) |
Sep
(14) |
Oct
(9) |
Nov
(22) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(25) |
Feb
(3) |
Mar
(27) |
Apr
(14) |
May
(15) |
Jun
(112) |
Jul
(44) |
Aug
(7) |
Sep
(18) |
Oct
(34) |
Nov
(17) |
Dec
(20) |
| 2006 |
Jan
(12) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(11) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 19:25:59
|
Update of /cvsroot/robotflow/RobotFlow/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3216 Modified Files: home.html Log Message: Added Doxygen Documentation. Index: home.html =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/html/home.html,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** home.html 15 Apr 2004 17:15:31 -0000 1.21 --- home.html 27 May 2004 19:25:48 -0000 1.22 *************** *** 31,34 **** --- 31,38 ---- <table width="100%"> <tr> + <td width="15%"> <div align=left>27/05/2004</div></td> + <td width="85%"> <div align=left><a href="doc.html">Added Doxygen Documentation</a></div></td> + </tr> + <tr> <td width="15%"> <div align=left>07/04/2004</div></td> <td width="85%"> <div align=left><a href="http://robotflow.sourceforge.net/wiki/phpwiki-1.3.7/">RobotFlow wiki now available</a>.</div></td> |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 19:23:46
|
Update of /cvsroot/robotflow/RobotFlow/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2750 Modified Files: doc.html Log Message: Updated documentation. Index: doc.html =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/html/doc.html,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** doc.html 27 May 2004 16:00:45 -0000 1.15 --- doc.html 27 May 2004 19:23:36 -0000 1.16 *************** *** 25,31 **** <td><b>FlowDesigner</b></td> <td>FlowDesigner documentation</td> ! <td>0.7</td> ! <td><a href="http://freespeech.sourceforge.net/doc/user-manual.pdf">[PDF]</a> ! <a href="http://freespeech.sourceforge.net/doc/user-manual.ps">[PS]</a></td> </tr> <tr> --- 25,31 ---- <td><b>FlowDesigner</b></td> <td>FlowDesigner documentation</td> ! <td>0.8</td> ! <td><a href="http://flowdesigner.sourceforge.net/doc/user-manual.pdf">[PDF]</a> ! <a href="http://flowdesigner.sourceforge.net/doc/user-manual.ps.gz">[PS]</a></td> </tr> <tr> *************** *** 66,70 **** <li> GNU make </li> <br> ! <li> GNOME2 (including the development libraries and libxml2)</li> <br> <li> FlowDesigner properly installed</li> --- 66,70 ---- <li> GNU make </li> <br> ! <li> GNOME2 (including the development libraries, libxml2 and libSDL)</li> <br> <li> FlowDesigner properly installed</li> *************** *** 89,95 **** <li> Go to the RobotFlow directory </li> <ul><li>% <b>cd RobotFlow</b> </li></ul> ! <li> Run the autogen.sh script <i>(or the configure script if you downloaded the RobotFlow distribution from Sourceforge)</i> in the RobotFlow directory. It uses autoconf, automake and libtool to create the makefiles. ! You <b>do not need</b> to provide any parameters, since the installation directory is directly taken from the flowdesigner_config script. </li> ! <ul><li><b>% ./autogen.sh or ./configure</b></li></ul> <li> Run make </li> <ul><li> <b>% make</b> </li></ul> --- 89,99 ---- <li> Go to the RobotFlow directory </li> <ul><li>% <b>cd RobotFlow</b> </li></ul> ! <li> Run the autogen.sh script <i>(or the configure script if you downloaded the RobotFlow ! distribution from Sourceforge)</i> in the RobotFlow directory. It uses autoconf, automake ! and libtool to create the makefiles. <b>You must specify where Player is installed with ! the autogen.sh or configure script if you want to use the Player blocks.</b> ! ! ! <ul><li><b>% ./autogen.sh --with-player="path" or ./configure --with-player="path"</b></li></ul> <li> Run make </li> <ul><li> <b>% make</b> </li></ul> |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 18:32:34
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24545 Modified Files: Doxyfile Log Message: Linking with the FlowDesigner doxygen documentation Index: Doxyfile =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Doxyfile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Doxyfile 27 May 2004 17:19:15 -0000 1.3 --- Doxyfile 27 May 2004 18:32:15 -0000 1.4 *************** *** 415,419 **** # subdirectory from a directory tree whose root is specified with the INPUT tag. ! EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories --- 415,419 ---- # subdirectory from a directory tree whose root is specified with the INPUT tag. ! EXCLUDE = Player-1.1/ # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories *************** *** 585,589 **** # of the generated HTML documentation. ! GENERATE_HTMLHELP = NO # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can --- 585,589 ---- # of the generated HTML documentation. ! GENERATE_HTMLHELP = YES # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can *************** *** 680,684 **** # executive. If left blank a4wide will be used. ! PAPER_TYPE = a4wide # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX --- 680,684 ---- # executive. If left blank a4wide will be used. ! PAPER_TYPE = letter # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX *************** *** 953,957 **** # is run, you must also specify the path to the tagfile here. ! TAGFILES = /home/dominic/working_area/FlowDesigner/doc/doxygen/FlowDesigner.tag=/home/dominic/working_area/FlowDesigner/doc/doxygen/html # When a file name is specified after GENERATE_TAGFILE, doxygen will create --- 953,957 ---- # is run, you must also specify the path to the tagfile here. ! TAGFILES = ../FlowDesigner/doc/doxygen/FlowDesigner.tag=http://flowdesigner.sourceforge.net/doc/doxygen/html/ # When a file name is specified after GENERATE_TAGFILE, doxygen will create *************** *** 1020,1024 **** # Language. ! UML_LOOK = NO # If set to YES, the inheritance and collaboration graphs will show the --- 1020,1024 ---- # Language. ! UML_LOOK = YES # If set to YES, the inheritance and collaboration graphs will show the |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 17:19:27
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11199 Modified Files: Doxyfile Log Message: using FlowDesigner tag file Index: Doxyfile =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Doxyfile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Doxyfile 27 May 2004 15:34:31 -0000 1.2 --- Doxyfile 27 May 2004 17:19:15 -0000 1.3 *************** *** 24,28 **** # if some version control system is used. ! PROJECT_NUMBER = Version0.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) --- 24,28 ---- # if some version control system is used. ! PROJECT_NUMBER = 0.2.3 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) *************** *** 349,353 **** # by doxygen. Possible values are YES and NO. If left blank NO is used. ! QUIET = YES # The WARNINGS tag can be used to turn on/off the warning messages that are --- 349,353 ---- # by doxygen. Possible values are YES and NO. If left blank NO is used. ! QUIET = NO # The WARNINGS tag can be used to turn on/off the warning messages that are *************** *** 953,962 **** # is run, you must also specify the path to the tagfile here. ! TAGFILES = # When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. ! GENERATE_TAGFILE = # If the ALLEXTERNALS tag is set to YES all external classes will be listed --- 953,962 ---- # is run, you must also specify the path to the tagfile here. ! TAGFILES = /home/dominic/working_area/FlowDesigner/doc/doxygen/FlowDesigner.tag=/home/dominic/working_area/FlowDesigner/doc/doxygen/html # When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. ! GENERATE_TAGFILE = html/doxygen/RobotFlow.tag # If the ALLEXTERNALS tag is set to YES all external classes will be listed |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 16:00:55
|
Update of /cvsroot/robotflow/RobotFlow/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28297 Modified Files: doc.html news.html nodes.html Log Message: added doxygen documentation, updated Node documentation Index: news.html =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/html/news.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** news.html 15 Apr 2004 17:15:31 -0000 1.9 --- news.html 27 May 2004 16:00:45 -0000 1.10 *************** *** 9,12 **** --- 9,16 ---- <table width="100%"> <tr> + <td width="15%"> <div align=left>27/05/2004</div></td> + <td width="85%"> <div align=left><a href="doc.html">Added Doxygen Documentation</a></div></td> + </tr> + <tr> <td width="15%"> <div align=left>07/04/2004</div></td> <td width="85%"> <div align=left><a href="http://robotflow.sourceforge.net/wiki/phpwiki-1.3.7/">RobotFlow wiki now available</a>.</div></td> Index: nodes.html =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/html/nodes.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nodes.html 19 Jan 2004 22:59:23 -0000 1.1 --- nodes.html 27 May 2004 16:00:45 -0000 1.2 *************** *** 3,7 **** <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <meta name="GENERATOR" content="Overflow"> <meta name="Author" content="Jean-Marc Valin"> <title>FlowDesigner node documentation</title> --- 3,7 ---- <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <meta name="GENERATOR" content="FlowDesigner"> <meta name="Author" content="Jean-Marc Valin"> [...1235 lines suppressed...] Subsumption (RobotFlow:Behaviors)</h3> --- 1847,1851 ---- <td WIDTH="15%">MAX_FORWARD_VELOCITY</td><td WIDTH="15%">int</td><td WIDTH="40%">Maximum velocity allowed (mm/s).</td></tr><td WIDTH="15%">BACKWARD_VELOCITY</td><td WIDTH="15%">int</td><td WIDTH="40%">Default value when going backward.</td></tr><td WIDTH="15%">FRONT_DISTANCE</td><td WIDTH="15%">float</td><td WIDTH="40%">Front sonar reading befoir going backward.</td></tr><td WIDTH="15%">BACK_DISTANCE</td><td WIDTH="15%">float</td><td WIDTH="40%">Back sonar reading before going forward.</td></tr></tr> </table> ! <br>Return to: <a href="#RobotFlow:Behaviors">RobotFlow:Behaviors</a><br><br>See next category: <a href="#-">-</a><br><br>Return to: <a href="#Categories of available FlowDesigner nodes">Categories of available FlowDesigner nodes</a><br><br><p><a NAME="Subsumption"></a> <h3> Subsumption (RobotFlow:Behaviors)</h3> *************** *** 1847,1851 **** <td>none</td><td>none</td><td>none</td></tr> </table> ! <br>Return to: <a href="#RobotFlow:Behaviors">RobotFlow:Behaviors</a><br><br>See next category: <a href="#-">-</a><br><br>Return to: <a href="#Categories of available Overflow Nodes">Categories of available Overflow Nodes</a><br> </body> </frameset></html> --- 1868,1872 ---- <td>none</td><td>none</td><td>none</td></tr> </table> ! <br>Return to: <a href="#RobotFlow:Behaviors">RobotFlow:Behaviors</a><br><br>See next category: <a href="#-">-</a><br><br>Return to: <a href="#Categories of available FlowDesigner nodes">Categories of available FlowDesigner nodes</a><br> </body> </frameset></html> Index: doc.html =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/html/doc.html,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** doc.html 7 Apr 2004 12:41:54 -0000 1.14 --- doc.html 27 May 2004 16:00:45 -0000 1.15 *************** *** 35,44 **** <td><a href="documents/FSMDescription.pdf">[PDF]</a></td> </tr> ! <tr> <td><b>Nodes</b></td> <td>Available RobotFlow Nodes</td> ! <td>0.1.2</td> <td><a href="nodes.html">[HTML]</a></td> </tr> </tbody> </table> --- 35,50 ---- <td><a href="documents/FSMDescription.pdf">[PDF]</a></td> </tr> ! <tr> <td><b>Nodes</b></td> <td>Available RobotFlow Nodes</td> ! <td>0.2.3</td> <td><a href="nodes.html">[HTML]</a></td> </tr> + <tr> + <TD><b>API</b></TD> + <TD>Doxygen Documentation</TD> + <TD>0.2.3</TD> + <TD><a href="doxygen/html/index.html">[HTML]</a></TD> + </tr> </tbody> </table> |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 15:34:44
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22988 Modified Files: Doxyfile Log Message: updated Doxyfile Index: Doxyfile =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Doxyfile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Doxyfile 7 May 2003 17:16:25 -0000 1.1 --- Doxyfile 27 May 2004 15:34:31 -0000 1.2 *************** *** 1,194 **** ! # Doxyfile 1.2.18 #--------------------------------------------------------------------------- ! # General configuration options #--------------------------------------------------------------------------- PROJECT_NAME = RobotFlow ! PROJECT_NUMBER = Version 0.2 OUTPUT_DIRECTORY = html/doxygen OUTPUT_LANGUAGE = English ! EXTRACT_ALL = YES [...1284 lines suppressed...] + # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will + # generate a legend page explaining the meaning of the various boxes and + # arrows in the dot generated graphs. + GENERATE_LEGEND = YES + + # If the DOT_CLEANUP tag is set to YES (the default) Doxygen will + # remove the intermediate dot files that are used to generate + # the various graphs. + DOT_CLEANUP = YES + #--------------------------------------------------------------------------- ! # Configuration::additions related to the search engine #--------------------------------------------------------------------------- + + # The SEARCHENGINE tag specifies whether or not a search engine should be + # used. If set to NO the values of all tags below this one will be ignored. + SEARCHENGINE = NO |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 02:33:31
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18131 Modified Files: RobotFlow.spec Log Message: first prototype of make rpm Index: RobotFlow.spec =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/RobotFlow.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RobotFlow.spec 27 May 2004 02:18:06 -0000 1.1 --- RobotFlow.spec 27 May 2004 02:33:21 -0000 1.2 *************** *** 9,13 **** Copyright: GPL/LGPL Group: Application/Devel ! Source: http://download.sourceforge.net/flowdesigner/%{name}-%{ver}.tar.gz URL: http://robotflow.sourceforge.net/ Vendor: Laborius --- 9,13 ---- Copyright: GPL/LGPL Group: Application/Devel ! Source: http://download.sourceforge.net/robotflow/%{name}-%{ver}.tar.gz URL: http://robotflow.sourceforge.net/ Vendor: Laborius |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 02:29:32
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17430 Modified Files: Makefile.am configure.in Log Message: first prototype of make rpm Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.am 27 May 2004 00:27:21 -0000 1.14 --- Makefile.am 27 May 2004 02:29:11 -0000 1.15 *************** *** 8,9 **** --- 8,12 ---- SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Probes FSM endif + + rpm: dist + rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz Index: configure.in =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** configure.in 27 May 2004 01:29:10 -0000 1.31 --- configure.in 27 May 2004 02:29:11 -0000 1.32 *************** *** 113,117 **** AM_CONDITIONAL(WITH_PLAYER,false) fi ! AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) AM_MAINTAINER_MODE --- 113,117 ---- AM_CONDITIONAL(WITH_PLAYER,false) fi ! VERSION=$ROBOTFLOW_VERSION AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) AM_MAINTAINER_MODE |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 02:18:15
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15487 Added Files: RobotFlow.spec Log Message: added first prototype of RobotFlow spec file --- NEW FILE: RobotFlow.spec --- %define name RobotFlow %define ver 0.2.3 %define rel 1 Summary: A Robotics Toolkit for FlowDesigner Name: %name Version: %ver Release: %rel Copyright: GPL/LGPL Group: Application/Devel Source: http://download.sourceforge.net/flowdesigner/%{name}-%{ver}.tar.gz URL: http://robotflow.sourceforge.net/ Vendor: Laborius Packager: Dominic Letourneau (dom...@us...) BuildRoot: %{_tmppath}/root-%{name}-%{version} Prefix: %{_prefix} %description RobotFlow is a mobile robotics tookit based on the FlowDesigner project. FlowDesigner is a data-flow oriented architecture, similar to Simulink (Matlab) or Labview that is free (LGPL) and versatile. The visual programming interface provided in the FlowDesigner project will help people to better visualize & understand what is really happening in the robot's control loops, sensors, actuators, by using graphical probes and debugging in real-time. %prep %setup %build export CXXFLAGS='-O3 -march=pentium' export CFLAGS='-O3 -march=pentium' ./configure --prefix=/usr --disable-static %{__make} %install %makeinstall %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-, root, root, 0755) /usr/share/flowdesigner/toolbox/RobotFlow/* |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 01:29:20
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8341 Modified Files: configure.in Log Message: fixed Player library linking problem Index: configure.in =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** configure.in 27 May 2004 00:27:21 -0000 1.30 --- configure.in 27 May 2004 01:29:10 -0000 1.31 *************** *** 106,138 **** dnl test which PLAYER_DIR if test -n "$PLAYER_DIR"; then - CXXFLAGS="-I$PLAYER_DIR/include" - LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue" - AC_TRY_LINK([#include <playerclient.h>],[PlayerClient("localhost",PLAYER_PORTNUM);], PLAYER_FOUND="yes") - if test -n "$PLAYER_FOUND"; then AC_MSG_RESULT(found in $PLAYER_DIR) PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue" PLAYER_INCLUDES="-I$PLAYER_DIR/include" ! else ! AC_MSG_RESULT(Invalid with-player arg) ! exit ! fi ! fi ! ! dnl test if it is installed in /usr ! if test -z "$PLAYER_FOUND"; then ! LIBS="-lplayerclient" ! AC_TRY_LINK([#include <playerclient.h>],[PlayerClient("localhost",PLAYER_PORTNUM);], PLAYER_FOUND="yes") ! if test -n "$PLAYER_FOUND"; then ! AC_MSG_RESULT(yes) ! PLAYER_LIBS="-lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue" ! PLAYER_INCLUDES="" ! else ! AC_MSG_RESULT([not found, disabling Player support]) ! ! fi fi - AM_CONDITIONAL(WITH_PLAYER, test -n "$PLAYER_FOUND") - AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) AM_MAINTAINER_MODE --- 106,117 ---- dnl test which PLAYER_DIR if test -n "$PLAYER_DIR"; then AC_MSG_RESULT(found in $PLAYER_DIR) PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue" PLAYER_INCLUDES="-I$PLAYER_DIR/include" ! AM_CONDITIONAL(WITH_PLAYER,true) ! else ! AM_CONDITIONAL(WITH_PLAYER,false) fi AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) AM_MAINTAINER_MODE |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:28:06
|
Update of /cvsroot/robotflow/RobotFlow/Pioneer2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Pioneer2/src Modified Files: Makefile.am Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 1 May 2002 19:47:32 -0000 1.6 --- Makefile.am 27 May 2004 00:27:24 -0000 1.7 *************** *** 4,12 **** #AUTOMAKE_OPTIONS = no-dependencies ! install-data-local: ! echo "Installing libPioneer2" ! mkdir -p $(OVERFLOW_DATA)/toolbox/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(top_srcdir)/Pioneer2/src/*.cc $(top_srcdir)/Pioneer2/include/*.h > $(OVERFLOW_DATA)/toolbox/$(PACKAGE)/Pioneer2.def) ! (rm $(OVERFLOW_DATA)/lib/Pioneer2.tlb; ln -s $(OVERFLOW_DATA)/lib/libPioneer2.so $(OVERFLOW_DATA)/lib/Pioneer2.tlb) lib_LTLIBRARIES = libPioneer2.la --- 4,8 ---- #AUTOMAKE_OPTIONS = no-dependencies ! #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) lib_LTLIBRARIES = libPioneer2.la *************** *** 31,32 **** --- 27,34 ---- INCLUDES = -I../include $(OVERFLOW_INCLUDE) + + install-data-local: + echo "Installing libPioneer2" + mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) + (perl $(OVERFLOW_BIN)/info2def.pl $(libPioneer2_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Pioneer2.def) + (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Pioneer2.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libPioneer2.so Pioneer2.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:28:06
|
Update of /cvsroot/robotflow/RobotFlow/Generic/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Generic/src Modified Files: Makefile.am Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 23 Feb 2004 16:58:27 -0000 1.2 --- Makefile.am 27 May 2004 00:27:23 -0000 1.3 *************** *** 4,12 **** #AUTOMAKE_OPTIONS = no-dependencies ! install-data-local: ! echo "Installing libRF_Generic" ! mkdir -p $(OVERFLOW_DATA)/toolbox/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(top_srcdir)/Generic/src/*.cc $(top_srcdir)/Generic/include/*.h > $(OVERFLOW_DATA)/toolbox/$(PACKAGE)/RF_Generic.def) ! (rm $(OVERFLOW_DATA)/lib/RF_Generic.tlb; ln -s $(OVERFLOW_DATA)/lib/libRF_Generic.so $(OVERFLOW_DATA)/lib/RF_Generic.tlb) lib_LTLIBRARIES = libRF_Generic.la --- 4,8 ---- #AUTOMAKE_OPTIONS = no-dependencies ! #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) lib_LTLIBRARIES = libRF_Generic.la *************** *** 24,25 **** --- 20,26 ---- INCLUDES = -I../include $(OVERFLOW_INCLUDE) + install-data-local: + echo "Installing libRF_Generic" + mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) + (perl $(OVERFLOW_BIN)/info2def.pl $(libRF_Generic_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/RF_Generic.def) + (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/RF_Generic.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libRF_Generic.so RF_Generic.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:28:06
|
Update of /cvsroot/robotflow/RobotFlow/FSM/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/FSM/src Modified Files: Makefile.am Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/FSM/src/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 25 Nov 2003 19:20:24 -0000 1.6 --- Makefile.am 27 May 2004 00:27:23 -0000 1.7 *************** *** 4,12 **** #AUTOMAKE_OPTIONS = no-dependencies ! install-data-local: ! echo "Installing libRF_FSM" ! mkdir -p $(OVERFLOW_DATA)/toolbox/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(top_srcdir)/FSM/src/*.cc $(top_srcdir)/FSM/include/*.h > $(OVERFLOW_DATA)/toolbox/$(PACKAGE)/RF_FSM.def) ! (rm $(OVERFLOW_DATA)/lib/RF_FSM.tlb; ln -s $(OVERFLOW_DATA)/lib/libRF_FSM.so $(OVERFLOW_DATA)/lib/RF_FSM.tlb) lib_LTLIBRARIES = libRF_FSM.la --- 4,8 ---- #AUTOMAKE_OPTIONS = no-dependencies ! #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) lib_LTLIBRARIES = libRF_FSM.la *************** *** 21,23 **** $(XML2_INCLUDE) ! --- 17,23 ---- $(XML2_INCLUDE) ! install-data-local: ! echo "Installing libRF_FSM" ! mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libRF_FSM_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/RF_FSM.def) ! (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/RF_FSM.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libRF_FSM.so RF_FSM.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:28:04
|
Update of /cvsroot/robotflow/RobotFlow/Generic/n-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Generic/n-files Modified Files: Makefile.am Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/n-files/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 2 Dec 2003 13:14:30 -0000 1.2 --- Makefile.am 27 May 2004 00:27:23 -0000 1.3 *************** *** 1,5 **** #AUTOMAKE_OPTIONS = no-dependencies ! toolboxdir = $(OVERFLOW_DATA)/toolbox/RobotFlow/Generic toolbox_DATA = RobotSonars.n RobotConnect.n RobotPTZ.n --- 1,5 ---- #AUTOMAKE_OPTIONS = no-dependencies ! toolboxdir = $(OVERFLOW_DATA)/$(PACKAGE) toolbox_DATA = RobotSonars.n RobotConnect.n RobotPTZ.n |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:28:04
|
Update of /cvsroot/robotflow/RobotFlow/Behaviors/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Behaviors/src Modified Files: Makefile.am Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 14 May 2004 14:09:48 -0000 1.9 --- Makefile.am 27 May 2004 00:27:21 -0000 1.10 *************** *** 4,12 **** #AUTOMAKE_OPTIONS = no-dependencies ! install-data-local: ! echo "Installing libBehaviors" ! mkdir -p $(OVERFLOW_DATA)/toolbox/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(top_srcdir)/Behaviors/src/*.cc $(top_srcdir)/Behaviors/include/*.h > $(OVERFLOW_DATA)/toolbox/$(PACKAGE)/Behaviors.def) ! (rm $(OVERFLOW_DATA)/lib/Behaviors.tlb; ln -s $(OVERFLOW_DATA)/lib/libBehaviors.so $(OVERFLOW_DATA)/lib/Behaviors.tlb) lib_LTLIBRARIES = libBehaviors.la --- 4,8 ---- #AUTOMAKE_OPTIONS = no-dependencies ! #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) lib_LTLIBRARIES = libBehaviors.la *************** *** 40,41 **** --- 36,43 ---- -I../../Pioneer2/include/ \ -I../../Generic/include/ + + install-data-local: + echo "Installing libBehaviors" + mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) + (perl $(OVERFLOW_BIN)/info2def.pl $(libBehaviors_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Behaviors.def) + (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Behaviors.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libBehaviors.so Behaviors.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:28:04
|
Update of /cvsroot/robotflow/RobotFlow/Control/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Control/src Modified Files: Makefile.am Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 8 Dec 2003 21:32:21 -0000 1.4 --- Makefile.am 27 May 2004 00:27:22 -0000 1.5 *************** *** 4,12 **** #AUTOMAKE_OPTIONS = no-dependencies ! install-data-local: ! echo "Installing libControl" ! mkdir -p $(OVERFLOW_DATA)/toolbox/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(top_srcdir)/Control/src/*.cc $(top_srcdir)/Control/include/*.h > $(OVERFLOW_DATA)/toolbox/$(PACKAGE)/Control.def) ! (rm $(OVERFLOW_DATA)/lib/Control.tlb; ln -s $(OVERFLOW_DATA)/lib/libControl.so $(OVERFLOW_DATA)/lib/Control.tlb) lib_LTLIBRARIES = libControl.la --- 4,8 ---- #AUTOMAKE_OPTIONS = no-dependencies ! #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) lib_LTLIBRARIES = libControl.la *************** *** 22,23 **** --- 18,25 ---- INCLUDES = -I../include $(OVERFLOW_INCLUDE) $(GNOME_INCLUDE) + + install-data-local: + echo "Installing libControl" + mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) + (perl $(OVERFLOW_BIN)/info2def.pl $(libControl_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Control.def) + (rm $(OVERFLOW_DATA)/$(PACKAGE)/Control.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libControl.so Control.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:28:03
|
Update of /cvsroot/robotflow/RobotFlow/Devices/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Devices/src Modified Files: Makefile.am Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 17 Jun 2003 17:27:21 -0000 1.8 --- Makefile.am 27 May 2004 00:27:22 -0000 1.9 *************** *** 4,12 **** #AUTOMAKE_OPTIONS = no-dependencies ! install-data-local: ! echo "Installing libDevices" ! mkdir -p $(OVERFLOW_DATA)/toolbox/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(top_srcdir)/Devices/src/*.cc $(top_srcdir)/Devices/include/*.h > $(OVERFLOW_DATA)/toolbox/$(PACKAGE)/Devices.def) ! (rm $(OVERFLOW_DATA)/lib/Devices.tlb; ln -s $(OVERFLOW_DATA)/lib/libDevices.so $(OVERFLOW_DATA)/lib/Devices.tlb) lib_LTLIBRARIES = libDevices.la --- 4,9 ---- #AUTOMAKE_OPTIONS = no-dependencies ! ! #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) lib_LTLIBRARIES = libDevices.la *************** *** 24,25 **** --- 21,28 ---- INCLUDES = -I../include $(OVERFLOW_INCLUDE) $(GNOME_INCLUDE) \ -I../../Vision/include + + install-data-local: + echo "Installing libDevices" + mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) + (perl $(OVERFLOW_BIN)/info2def.pl $(libDevices_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Devices.def) + (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Devices.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libDevices.so Devices.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:28:03
|
Update of /cvsroot/robotflow/RobotFlow/Control/n-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Control/n-files Modified Files: Makefile.am Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Control/n-files/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 8 Dec 2003 21:32:21 -0000 1.1 --- Makefile.am 27 May 2004 00:27:21 -0000 1.2 *************** *** 1,5 **** #AUTOMAKE_OPTIONS = no-dependencies ! toolboxdir = $(OVERFLOW_DATA)/toolbox/RobotFlow/Control toolbox_DATA = PTZPID.n --- 1,5 ---- #AUTOMAKE_OPTIONS = no-dependencies ! toolboxdir = $(OVERFLOW_DATA)/$(PACKAGE) toolbox_DATA = PTZPID.n |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:28:01
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362 Modified Files: Makefile.am configure.in Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.am 8 Dec 2003 21:32:19 -0000 1.13 --- Makefile.am 27 May 2004 00:27:21 -0000 1.14 *************** *** 3,5 **** --- 3,9 ---- #AUTOMAKE_OPTIONS = no-dependencies + if WITH_PLAYER SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Player Probes FSM + else + SUBDIRS = Generic Pioneer2 Behaviors Vision Control Devices Probes FSM + endif Index: configure.in =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** configure.in 20 May 2004 22:32:13 -0000 1.29 --- configure.in 27 May 2004 00:27:21 -0000 1.30 *************** *** 3,11 **** CXXFLAGS="-O2" ! AC_INIT(configure.in) ROBOTFLOW_MAJOR_VERSION=0 ROBOTFLOW_MINOR_VERSION=2 ! ROBOTFLOW_MICRO_VERSION=2 ROBOTFLOW_VERSION=$ROBOTFLOW_MAJOR_VERSION.$ROBOTFLOW_MINOR_VERSION.$ROBOTFLOW_MICRO_VERSION ROBOTFLOW_INTERFACE_AGE=0 --- 3,11 ---- CXXFLAGS="-O2" ! AC_INIT([RobotFlow], [0.2.3cvs], [rob...@li...]) ROBOTFLOW_MAJOR_VERSION=0 ROBOTFLOW_MINOR_VERSION=2 ! ROBOTFLOW_MICRO_VERSION=3 ROBOTFLOW_VERSION=$ROBOTFLOW_MAJOR_VERSION.$ROBOTFLOW_MINOR_VERSION.$ROBOTFLOW_MICRO_VERSION ROBOTFLOW_INTERFACE_AGE=0 *************** *** 46,49 **** --- 46,50 ---- AC_ENABLE_SHARED AM_PROG_LIBTOOL + AC_LANG_CPLUSPLUS AC_ARG_PROGRAM *************** *** 83,89 **** AC_PATH_PROG(SDL_CONFIG,sdl-config,no,$PATH) if test "$SDL_CONFIG" = no; then ! AC_MSG_ERROR( Cannot find sdl-config) fi ! AC_PATH_PROG(PKG_CONFIG,pkg-config,no,$PATH) --- 84,90 ---- AC_PATH_PROG(SDL_CONFIG,sdl-config,no,$PATH) if test "$SDL_CONFIG" = no; then ! AC_MSG_ERROR( Cannot find sdl-config, disabling SDL) fi ! AM_CONDITIONAL(WITH_SDL, test -n "$SDL_CONFIG") AC_PATH_PROG(PKG_CONFIG,pkg-config,no,$PATH) *************** *** 97,103 **** fi ! AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) ! dnl AM_MAINTAINER_MODE dnl Additional includes & libraries --- 98,140 ---- fi ! dnl Test for Player (Yannick Brosseau & Dominic Letourneau) ! AC_MSG_CHECKING(for player) ! PLAYER_FOUND="" ! AC_ARG_WITH(player, [ --with-player Where player is installed (/usr)], PLAYER_DIR="$withval") ! ! dnl test which PLAYER_DIR ! if test -n "$PLAYER_DIR"; then ! CXXFLAGS="-I$PLAYER_DIR/include" ! LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue" ! AC_TRY_LINK([#include <playerclient.h>],[PlayerClient("localhost",PLAYER_PORTNUM);], PLAYER_FOUND="yes") ! if test -n "$PLAYER_FOUND"; then ! AC_MSG_RESULT(found in $PLAYER_DIR) ! PLAYER_LIBS="-L$PLAYER_DIR/lib -lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue" ! PLAYER_INCLUDES="-I$PLAYER_DIR/include" ! else ! AC_MSG_RESULT(Invalid with-player arg) ! exit ! fi ! fi ! ! dnl test if it is installed in /usr ! if test -z "$PLAYER_FOUND"; then ! LIBS="-lplayerclient" ! AC_TRY_LINK([#include <playerclient.h>],[PlayerClient("localhost",PLAYER_PORTNUM);], PLAYER_FOUND="yes") ! if test -n "$PLAYER_FOUND"; then ! AC_MSG_RESULT(yes) ! PLAYER_LIBS="-lplayerc -lplayercclient -lplayerclient -lplayerpacket -lplayerqueue" ! PLAYER_INCLUDES="" ! else ! AC_MSG_RESULT([not found, disabling Player support]) ! ! fi ! fi ! ! AM_CONDITIONAL(WITH_PLAYER, test -n "$PLAYER_FOUND") ! ! AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) ! AM_MAINTAINER_MODE dnl Additional includes & libraries *************** *** 120,124 **** XML2_LIB=`$XML2_CONFIG --libs` ! prefix=$OVERFLOW_DATA AC_SUBST(GNOME_LIB) --- 157,161 ---- XML2_LIB=`$XML2_CONFIG --libs` ! prefix=$OVERFLOW_DATA/$PACKAGE AC_SUBST(GNOME_LIB) *************** *** 135,138 **** --- 172,177 ---- AC_SUBST(XML2_INCLUDE) AC_SUBST(XML2_LIB) + AC_SUBST(PLAYER_LIBS) + AC_SUBST(PLAYER_INCLUDES) dnl Output Files (makefiles) *************** *** 167,168 **** --- 206,233 ---- Generic/src/Makefile \ Generic/n-files/Makefile) + + + dnl Notification message for the user to know which flags will be used for compilation + dnl should use AC_MSG_NOTICE(), but that's apparently not defined in autoconf 2.13 + AC_MSG_RESULT([]) + AC_MSG_RESULT([*************************************************************]) + AC_MSG_RESULT([]) + AC_MSG_RESULT([$PACKAGE will be built on a $build system to run]) + AC_MSG_RESULT([on a $host system, with the following options:]) + AC_MSG_RESULT([]) + + AC_MSG_RESULT([$WITH_PLAYER - $WITH_SDL]) + + if test "$WITH_PLAYER" = "true"; then + AC_MSG_RESULT([$PACKAGE will build Player based blocks]) + else + AC_MSG_RESULT([$PACKAGE will NOT build Player based blocks]) + fi + + + + if test "$WITH_SDL" = "true"; then + AC_MSG_RESULT([$PACKAGE will build SDL based blocks]) + else + AC_MSG_RESULT([$PACKAGE will NOT build SDL based blocks]) + fi |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:27:57
|
Update of /cvsroot/robotflow/RobotFlow/Player/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Player/src Modified Files: Makefile.am PlayerConnect.cc PlayerGPS.cc PlayerGripper.cc PlayerLaser.cc PlayerPTZ.cc PlayerVelocity.cc Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: PlayerConnect.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerConnect.cc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** PlayerConnect.cc 3 Dec 2003 14:04:31 -0000 1.15 --- PlayerConnect.cc 27 May 2004 00:27:39 -0000 1.16 *************** *** 85,88 **** --- 85,93 ---- * @parameter_description Start GPS proxy if it's true. * + * @parameter_name LASER2_PROXY + * @parameter_type bool + * @parameter_value true + * @parameter_description Start laser proxy if it's true. + * END*/ *************** *** 108,111 **** --- 113,117 ---- m_startBlobFinderProxy = dereference_cast<bool>(parameters.get("BLOB_FINDER_PROXY")); m_startGPSProxy = dereference_cast<bool>(parameters.get("GPS_PROXY")); + m_startLaser2Proxy = dereference_cast<bool>(parameters.get("LASER2_PROXY")); } *************** *** 126,130 **** { //connecting to server ! m_client = ObjectRef(new PlayerClientWrap(m_host.c_str(),m_port, m_startPositionProxy, m_startGripperProxy, --- 132,136 ---- { //connecting to server ! m_client = ObjectRef(new PlayerClientWrap(m_host.c_str(),m_port, m_startPositionProxy, m_startGripperProxy, *************** *** 133,137 **** m_startSonarProxy, m_startBlobFinderProxy, ! m_startGPSProxy)); // initialize robot if position proxy enabled --- 139,144 ---- m_startSonarProxy, m_startBlobFinderProxy, ! m_startGPSProxy, ! m_startLaser2Proxy)); // initialize robot if position proxy enabled Index: PlayerLaser.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerLaser.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PlayerLaser.cc 9 Jul 2003 14:25:14 -0000 1.5 --- PlayerLaser.cc 27 May 2004 00:27:39 -0000 1.6 *************** *** 45,48 **** --- 45,53 ---- * @output_description The Intensity of the laser beam. * + * @parameter_name LASER2_PROXY + * @parameter_type bool + * @parameter_value false + * @parameter_description Start laser proxy if it's true. + * END*/ *************** *** 53,61 **** int m_intensityID; LaserProxy *m_laserProxy; public: PlayerLaser(string nodeName, ParameterSet params) ! : BufferedNode(nodeName, params), m_laserProxy(NULL) { //inputs --- 58,67 ---- int m_intensityID; LaserProxy *m_laserProxy; + bool m_isLaser2; public: PlayerLaser(string nodeName, ParameterSet params) ! : BufferedNode(nodeName, params), m_laserProxy(NULL), m_isLaser2(false) { //inputs *************** *** 67,70 **** --- 73,77 ---- m_intensityID = addOutput("INTENSITY"); + m_isLaser2 = dereference_cast<bool>(parameters.get("LASER2_PROXY")); } *************** *** 82,87 **** ObjectRef ClientValue = getInput(m_clientID,count); ! m_laserProxy = object_cast<PlayerClientWrap>(ClientValue).getLaserProxy(); ! if (m_laserProxy == NULL) { throw new GeneralException("PlayerLaser::calculate NULL laser proxy",__FILE__,__LINE__); --- 89,101 ---- ObjectRef ClientValue = getInput(m_clientID,count); ! if (m_isLaser2 == false) ! { ! m_laserProxy = object_cast<PlayerClientWrap>(ClientValue).getLaserProxy(); ! } ! else ! { ! m_laserProxy = object_cast<PlayerClientWrap>(ClientValue).getLaser2Proxy(); ! } ! if (m_laserProxy == NULL) { throw new GeneralException("PlayerLaser::calculate NULL laser proxy",__FILE__,__LINE__); Index: PlayerGPS.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerGPS.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PlayerGPS.cc 9 Jul 2003 14:25:14 -0000 1.5 --- PlayerGPS.cc 27 May 2004 00:27:39 -0000 1.6 *************** *** 31,35 **** * @name PlayerGPS * @category RobotFlow:Player ! * @description No description available * * @input_name CLIENT --- 31,35 ---- * @name PlayerGPS * @category RobotFlow:Player ! * @description The GPS interface provides access to an absolute position system, such as GPS. * * @input_name CLIENT *************** *** 37,51 **** * @input_description The player client to read data from. * ! * @output_name X ! * @output_type int ! * @output_description GPS X position (absolute) * ! * @output_name Y * @output_type int ! * @output_description GPS Y position (absolute) * ! * @output_name HEADING * @output_type int ! * @output_description Robot heading (absolute) * END*/ --- 37,59 ---- * @input_description The player client to read data from. * ! * @output_name LATITUDE ! * @output_type float ! * @output_description Latitude, in 1/60 of an arc-second. Positive is north of equator, negarive is south of equator. * ! * @output_name LONGITUDE ! * @output_type float ! * @output_description Longitude, in 1/60 of an arc-second. Positive is east of prime meridian, negative is west of prime meridian. ! * ! * @output_name ALTITUDE ! * @output_type float ! * @output_description Altitude, in millimeters. Positive is above reference (e.g., sea-level), and negative is below. ! * ! * @output_name QUALITY * @output_type int ! * @output_description Quality of fix 0 = invalid, 1 = FPS fix, 2 = DGPS fix. * ! * @output_name NUMBER_OF_SATELLITES * @output_type int ! * @output_description Number of satellites in view. * END*/ *************** *** 54,60 **** int m_clientID; ! int m_XID; ! int m_YID; ! int m_HeadingID; GpsProxy *m_gpsProxy; --- 62,70 ---- int m_clientID; ! int m_latitudeID; ! int m_longitudeID; ! int m_altitudeID; ! int m_qualityID; ! int m_numSatsID; GpsProxy *m_gpsProxy; *************** *** 69,75 **** //outputs ! m_XID = addOutput("X"); ! m_YID = addOutput("Y"); ! m_HeadingID = addOutput("HEADING"); } --- 79,87 ---- //outputs ! m_latitudeID = addOutput("LATITUDE"); ! m_longitudeID = addOutput("LONGITUDE"); ! m_altitudeID = addOutput("ALTITUDE"); ! m_qualityID = addOutput("QUALITY"); ! m_numSatsID = addOutput("NUMBER_OF_SATELLITES"); } *************** *** 94,101 **** } ! //output current position ! (*outputs[m_XID].buffer)[count] = ObjectRef(Int::alloc(m_gpsProxy->xpos)); ! (*outputs[m_YID].buffer)[count] = ObjectRef(Int::alloc(m_gpsProxy->ypos)); ! (*outputs[m_HeadingID].buffer)[count] = ObjectRef(Int::alloc(m_gpsProxy->heading)); } --- 106,116 ---- } ! //output GPS informations ! (*outputs[m_latitudeID].buffer)[count] = ObjectRef(Float::alloc(m_gpsProxy->latitude)); ! (*outputs[m_longitudeID].buffer)[count] = ObjectRef(Float::alloc(m_gpsProxy->longitude)); ! (*outputs[m_altitudeID].buffer)[count] = ObjectRef(Float::alloc(m_gpsProxy->altitude)); ! (*outputs[m_qualityID].buffer)[count] = ObjectRef(Int::alloc(m_gpsProxy->quality)); ! (*outputs[m_numSatsID].buffer)[count] = ObjectRef(Int::alloc(m_gpsProxy->satellites)); ! } Index: PlayerPTZ.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerPTZ.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerPTZ.cc 4 Dec 2003 18:48:40 -0000 1.7 --- PlayerPTZ.cc 27 May 2004 00:27:39 -0000 1.8 *************** *** 60,63 **** --- 60,73 ---- * @input_description The relative zoom command. 0->1023. (0 = wide, 1023 = telephoto). * + * @parameter_name PAN_SPEED + * @parameter_type int + * @parameter_value 24 + * @parameter_description Pan speed 0-24 + * + * @parameter_name TILT_SPEED + * @parameter_type int + * @parameter_value 20 + * @parameter_description Tilt speed 0-20 + * * @output_name PAN * @output_type int *************** *** 77,81 **** { ! //intputs int m_clientID; int m_relPanID; --- 87,91 ---- { ! // inputs int m_clientID; int m_relPanID; *************** *** 86,90 **** int m_absZoomID; ! //outputs int m_panOutID; int m_tiltOutID; --- 96,104 ---- int m_absZoomID; ! // parameters ! int m_panSpeed; ! int m_tiltSpeed; ! ! // outputs int m_panOutID; int m_tiltOutID; *************** *** 92,95 **** --- 106,110 ---- PtzProxy *m_ptzProxy; + bool m_isInit; *************** *** 97,101 **** PlayerPTZ(string nodeName, ParameterSet params) ! : BufferedNode(nodeName, params), m_ptzProxy(NULL) { //inputs --- 112,116 ---- PlayerPTZ(string nodeName, ParameterSet params) ! : BufferedNode(nodeName, params), m_ptzProxy(NULL), m_isInit(false) { //inputs *************** *** 110,113 **** --- 125,132 ---- m_absZoomID = addInput("ABS_ZOOM"); + // parameters + m_panSpeed = dereference_cast<int>(parameters.get("PAN_SPEED")); + m_tiltSpeed = dereference_cast<int>(parameters.get("TILT_SPEED")); + //outputs m_panOutID = addOutput("PAN"); *************** *** 144,147 **** --- 163,176 ---- } + if(!m_isInit) + { + m_ptzProxy->SetSpeed(m_panSpeed, m_tiltSpeed); + m_isInit = true; + } + + m_panSpeed = dereference_cast<int>(parameters.get("PAN_SPEED")); + m_tiltSpeed = dereference_cast<int>(parameters.get("TILT_SPEED")); + + int pan_command = m_ptzProxy->pan; int tilt_command = m_ptzProxy->tilt; Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 26 May 2004 18:48:54 -0000 1.5 --- Makefile.am 27 May 2004 00:27:39 -0000 1.6 *************** *** 4,12 **** #AUTOMAKE_OPTIONS = no-dependencies ! install-data-local: ! echo "Installing libPlayerDevices" ! mkdir -p $(OVERFLOW_DATA)/toolbox/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(top_srcdir)/Player/src/*.cc $(top_srcdir)/Player/include/*.h > $(OVERFLOW_DATA)/toolbox/$(PACKAGE)/PlayerDevices.def) ! (rm $(OVERFLOW_DATA)/lib/PlayerDevices.tlb; ln -s $(OVERFLOW_DATA)/lib/libPlayerDevices.so $(OVERFLOW_DATA)/lib/PlayerDevices.tlb) lib_LTLIBRARIES = libPlayerDevices.la --- 4,8 ---- #AUTOMAKE_OPTIONS = no-dependencies ! #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) lib_LTLIBRARIES = libPlayerDevices.la *************** *** 23,30 **** PlayerGripper.cc ! ! libPlayerDevices_la_LDFLAGS = -release $(LT_RELEASE) INCLUDES = -I../include $(OVERFLOW_INCLUDE) \ -I../../Pioneer2/include \ ! -I../../Vision/include --- 19,32 ---- PlayerGripper.cc ! libPlayerDevices_la_LDFLAGS = -release $(LT_RELEASE) $(PLAYER_LIBS) $(OVERFLOW_LIBS) INCLUDES = -I../include $(OVERFLOW_INCLUDE) \ -I../../Pioneer2/include \ ! -I../../Vision/include \ ! $(PLAYER_INCLUDES) ! ! install-data-local: ! echo "Installing libPlayerDevices" ! mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(libPlayerDevices_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/PlayerDevices.def) ! (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/PlayerDevices.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libPlayerDevices.so PlayerDevices.tlb) Index: PlayerVelocity.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerVelocity.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerVelocity.cc 9 Jul 2003 17:17:18 -0000 1.7 --- PlayerVelocity.cc 27 May 2004 00:27:39 -0000 1.8 *************** *** 68,71 **** --- 68,73 ---- PositionProxy *m_positionProxy; + int m_lastVelocity; + int m_lastHeading; public: *************** *** 82,85 **** --- 84,90 ---- m_yposID = addOutput("YPOS"); m_thetaID = addOutput("THETA"); + + m_lastVelocity = 0; + m_lastHeading = 0; } *************** *** 110,118 **** //reading new data from player. ! ! if (!VelocityValue->isNil() && !HeadingValue->isNil()) { int vel = dereference_cast<int>(VelocityValue); int rot = dereference_cast<int>(HeadingValue); ! // write commands to robot m_positionProxy->SetSpeed(vel,rot); } --- 115,157 ---- //reading new data from player. ! ! if (!VelocityValue->isNil() && !HeadingValue->isNil()) { int vel = dereference_cast<int>(VelocityValue); int rot = dereference_cast<int>(HeadingValue); ! // write commands to robot ! if (m_lastVelocity != vel || m_lastHeading != rot){ ! m_positionProxy->SetSpeed(vel,rot); ! m_lastVelocity = vel; ! m_lastHeading = rot; ! } ! } ! else if (VelocityValue->isNil() && !HeadingValue->isNil()) { ! int rot = dereference_cast<int>(HeadingValue); ! // write commands to robot ! if (m_lastHeading != rot){ ! m_positionProxy->SetSpeed(0,rot); ! m_lastHeading = rot; ! } ! } ! else if (!VelocityValue->isNil() && HeadingValue->isNil()) { ! int vel = dereference_cast<int>(VelocityValue); ! // write commands to robot ! if (m_lastVelocity != vel){ ! m_positionProxy->SetSpeed(vel,0); ! m_lastVelocity = vel; ! } ! } ! else{ ! if (m_lastVelocity != 0 || m_lastHeading != 0){ ! m_positionProxy->SetSpeed(0,0); ! m_lastVelocity = 0; ! m_lastHeading = 0; ! } ! } ! /**** old ! if (!VelocityValue->isNil() && !HeadingValue->isNil()) { ! int vel = dereference_cast<int>(VelocityValue); ! int rot = dereference_cast<int>(HeadingValue); ! // write commands to robot m_positionProxy->SetSpeed(vel,rot); } *************** *** 120,132 **** else if (VelocityValue->isNil() && !HeadingValue->isNil()) { int rot = dereference_cast<int>(HeadingValue); ! // write commands to robot m_positionProxy->SetSpeed(0,rot); } else if (!VelocityValue->isNil() && HeadingValue->isNil()) { int vel = dereference_cast<int>(VelocityValue); ! // write commands to robot m_positionProxy->SetSpeed(vel,0); } ! //write output (*outputs[m_xposID].buffer)[count] = ObjectRef(Int::alloc(m_positionProxy->Xpos())); --- 159,172 ---- else if (VelocityValue->isNil() && !HeadingValue->isNil()) { int rot = dereference_cast<int>(HeadingValue); ! // write commands to robot m_positionProxy->SetSpeed(0,rot); } else if (!VelocityValue->isNil() && HeadingValue->isNil()) { int vel = dereference_cast<int>(VelocityValue); ! // write commands to robot m_positionProxy->SetSpeed(vel,0); } ! ***/ ! //write output (*outputs[m_xposID].buffer)[count] = ObjectRef(Int::alloc(m_positionProxy->Xpos())); Index: PlayerGripper.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerGripper.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PlayerGripper.cc 9 Jul 2003 14:25:14 -0000 1.5 --- PlayerGripper.cc 27 May 2004 00:27:39 -0000 1.6 *************** *** 67,70 **** --- 67,72 ---- //variables GripperProxy *m_gripperProxy; + unsigned char m_lastCmd; + public: *************** *** 82,85 **** --- 84,88 ---- m_beamsID = addOutput("BEAMS"); + m_lastCmd = 0; } *************** *** 117,123 **** } ! //send command with SetGrip ! if ((m_gripperProxy->SetGrip(cmd,arg)) < 0) { ! throw new GeneralException("Unable to send gripper commands",__FILE__,__LINE__); } } --- 120,129 ---- } ! if (m_lastCmd != cmd) ! { ! //send command with SetGrip ! if ((m_gripperProxy->SetGrip(cmd,arg)) < 0) { ! throw new GeneralException("Unable to send gripper commands",__FILE__,__LINE__); ! } } } |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:27:54
|
Update of /cvsroot/robotflow/RobotFlow/Vision/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Vision/src Modified Files: Makefile.am Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.am 7 Apr 2004 13:01:11 -0000 1.19 --- Makefile.am 27 May 2004 00:27:41 -0000 1.20 *************** *** 4,12 **** #AUTOMAKE_OPTIONS = no-dependencies ! install-data-local: ! echo "Installing libVision" ! mkdir -p $(OVERFLOW_DATA)/toolbox/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(top_srcdir)/Vision/src/*.cc $(top_srcdir)/Vision/include/*.h > $(OVERFLOW_DATA)/toolbox/$(PACKAGE)/Vision.def) ! (rm $(OVERFLOW_DATA)/lib/Vision.tlb; ln -s $(OVERFLOW_DATA)/lib/libVision.so $(OVERFLOW_DATA)/lib/Vision.tlb) lib_LTLIBRARIES = libVision.la --- 4,8 ---- #AUTOMAKE_OPTIONS = no-dependencies ! #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) lib_LTLIBRARIES = libVision.la *************** *** 48,53 **** MultiColorTracker.cc - libVision_la_LDFLAGS = -release $(LT_RELEASE) $(PIXBUF_LIBS) $(GNOME_LIB) INCLUDES = -I../include $(OVERFLOW_INCLUDE) $(PIXBUF_INCLUDE) --- 44,54 ---- MultiColorTracker.cc libVision_la_LDFLAGS = -release $(LT_RELEASE) $(PIXBUF_LIBS) $(GNOME_LIB) INCLUDES = -I../include $(OVERFLOW_INCLUDE) $(PIXBUF_INCLUDE) + + install-data-local: + echo "Installing libVision" + mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) + (perl $(OVERFLOW_BIN)/info2def.pl $(libVision_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Vision.def) + (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Vision.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libVision.so Vision.tlb) |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:27:53
|
Update of /cvsroot/robotflow/RobotFlow/Player/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Player/include Modified Files: Makefile.am PlayerConnect.h Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: PlayerConnect.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/include/PlayerConnect.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlayerConnect.h 4 Dec 2003 18:48:36 -0000 1.6 --- PlayerConnect.h 27 May 2004 00:27:39 -0000 1.7 *************** *** 30,33 **** --- 30,34 ---- GripperProxy *m_gripperProxy; LaserProxy *m_laserProxy; + LaserProxy *m_laser2Proxy; PtzProxy *m_ptzProxy; SonarProxy *m_sonarProxy; *************** *** 39,43 **** bool startLaserProxy, bool startPTZProxy, bool startSonarProxy, bool startBlobFinderProxy, ! bool startGPSProxy) { --- 40,44 ---- bool startLaserProxy, bool startPTZProxy, bool startSonarProxy, bool startBlobFinderProxy, ! bool startGPSProxy, bool startLaser2Proxy) { *************** *** 71,74 **** --- 72,79 ---- m_gpsProxy = new GpsProxy(&m_client,0,'a'); } + if(startLaser2Proxy) + { + m_laser2Proxy = new LaserProxy(&m_client,1,'a'); + } } *************** *** 88,120 **** } ! if (m_laserProxy) { delete m_laserProxy; m_laserProxy = NULL; } ! ! if (m_ptzProxy) { delete m_ptzProxy; m_ptzProxy = NULL; } ! ! if (m_sonarProxy) { delete m_sonarProxy; m_sonarProxy = NULL; } ! ! if (m_blobFinderProxy) { delete m_blobFinderProxy; m_blobFinderProxy = NULL; } ! ! if (m_gpsProxy) { delete m_gpsProxy; m_gpsProxy = NULL; } } --- 93,131 ---- } ! if (m_laserProxy) { delete m_laserProxy; m_laserProxy = NULL; } ! ! if (m_ptzProxy) { delete m_ptzProxy; m_ptzProxy = NULL; } ! ! if (m_sonarProxy) { delete m_sonarProxy; m_sonarProxy = NULL; } ! ! if (m_blobFinderProxy) { delete m_blobFinderProxy; m_blobFinderProxy = NULL; } ! ! if (m_gpsProxy) { delete m_gpsProxy; m_gpsProxy = NULL; } + + if (m_laser2Proxy) + { + delete m_laser2Proxy; + m_laser2Proxy = NULL; + } } *************** *** 125,137 **** bool startLaserProxy = true, bool startPTZProxy = true, bool startSonarProxy = true, bool startBlobFinderProxy = true, ! bool startGPSProxy = true) : m_client(hostname,port), m_positionProxy(NULL), ! m_gripperProxy(NULL), m_laserProxy(NULL), m_ptzProxy(NULL), ! m_sonarProxy (NULL), m_blobFinderProxy(NULL), m_gpsProxy(NULL) { createProxies(startPositionProxy, startGripperProxy, startLaserProxy, startPTZProxy,startSonarProxy, startBlobFinderProxy, ! startGPSProxy); } --- 136,148 ---- bool startLaserProxy = true, bool startPTZProxy = true, bool startSonarProxy = true, bool startBlobFinderProxy = true, ! bool startGPSProxy = true, bool startLaser2Proxy = true) : m_client(hostname,port), m_positionProxy(NULL), ! m_gripperProxy(NULL), m_laserProxy(NULL), m_ptzProxy(NULL), ! m_sonarProxy (NULL), m_blobFinderProxy(NULL), m_gpsProxy(NULL), m_laser2Proxy(NULL) { createProxies(startPositionProxy, startGripperProxy, startLaserProxy, startPTZProxy,startSonarProxy, startBlobFinderProxy, ! startGPSProxy, startLaser2Proxy); } *************** *** 148,152 **** PtzProxy * getPtzProxy() {return m_ptzProxy;} ! SonarProxy *getSonarProxy() {return m_sonarProxy;} --- 159,163 ---- PtzProxy * getPtzProxy() {return m_ptzProxy;} ! SonarProxy *getSonarProxy() {return m_sonarProxy;} *************** *** 155,159 **** GpsProxy * getGpsProxy() {return m_gpsProxy;} ! // check if we are connected bool Connected() { return (m_client.Connected());} --- 166,171 ---- GpsProxy * getGpsProxy() {return m_gpsProxy;} ! LaserProxy * getLaser2Proxy() {return m_laser2Proxy;} ! // check if we are connected bool Connected() { return (m_client.Connected());} *************** *** 196,199 **** --- 208,212 ---- bool m_startGripperProxy; bool m_startLaserProxy; + bool m_startLaser2Proxy; bool m_startPTZProxy; bool m_startSonarProxy; Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/include/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 26 May 2004 18:48:54 -0000 1.3 --- Makefile.am 27 May 2004 00:27:25 -0000 1.4 *************** *** 2,3 **** --- 2,5 ---- noinst_HEADERS = PlayerConnect.h + + |
|
From: Dominic L?t. <ma...@us...> - 2004-05-27 00:27:53
|
Update of /cvsroot/robotflow/RobotFlow/Probes/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Probes/src Modified Files: Makefile.am Log Message: watch out, a lot of things have been modified in the installation structure, Player and librairies Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 11 May 2004 20:01:04 -0000 1.7 --- Makefile.am 27 May 2004 00:27:40 -0000 1.8 *************** *** 4,12 **** #AUTOMAKE_OPTIONS = no-dependencies ! install-data-local: ! echo "Installing libProbes" ! mkdir -p $(OVERFLOW_DATA)/toolbox/$(PACKAGE) ! (perl $(OVERFLOW_BIN)/info2def.pl $(top_srcdir)/Probes/src/*.cc $(top_srcdir)/Probes/include/*.h > $(OVERFLOW_DATA)/toolbox/$(PACKAGE)/Probes.def) ! (rm $(OVERFLOW_DATA)/lib/Probes.tlb; ln -s $(OVERFLOW_DATA)/lib/libProbes.so $(OVERFLOW_DATA)/lib/Probes.tlb) lib_LTLIBRARIES = libProbes.la --- 4,8 ---- #AUTOMAKE_OPTIONS = no-dependencies ! #override libdir=$(OVERFLOW_DATA)/$(PACKAGE) lib_LTLIBRARIES = libProbes.la *************** *** 14,24 **** # Sources for compilation in the library libProbes_la_SOURCES = ImageProbe.cc \ - ImageProbeSDL.cc \ LaserProbe.cc \ VirtualJoystick.cc \ ColorTrain.cc \ PTZControl.cc - libProbes_la_LDFLAGS = -release $(LT_RELEASE) $(SDL_LIB) --- 10,21 ---- # Sources for compilation in the library libProbes_la_SOURCES = ImageProbe.cc \ LaserProbe.cc \ VirtualJoystick.cc \ ColorTrain.cc \ PTZControl.cc + if WITH_SDL + libProbes_la_SOURCES += ImageProbeSDL.cc + endif libProbes_la_LDFLAGS = -release $(LT_RELEASE) $(SDL_LIB) *************** *** 27,30 **** -I../../Vision/include $(SDL_INCLUDE) - LDADD = $(SDL_LIB) --- 24,32 ---- -I../../Vision/include $(SDL_INCLUDE) LDADD = $(SDL_LIB) + + install-data-local: + echo "Installing libProbes" + mkdir -p $(OVERFLOW_DATA)/$(PACKAGE) + (perl $(OVERFLOW_BIN)/info2def.pl $(libProbes_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Probes.def) + (rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Probes.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libProbes.so Probes.tlb) |
Update of /cvsroot/robotflow/RobotFlow/Player/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28810/src Modified Files: Makefile.am Removed Files: audiodspproxy.cc audiomixerproxy.cc audioproxy.cc blobfinderproxy.cc bumperproxy.cc clientproxy.cc commsproxy.cc descartesproxy.cc dioproxy.cc fiducialproxy.cc gpsproxy.cc gripperproxy.cc idarproxy.cc idarturretproxy.cc irproxy.cc laserproxy.cc localizeproxy.cc mcomproxy.cc moteproxy.cc playercclient.c playerclient.cc playermulticlient.cc playerpacket.c positionproxy.cc powerproxy.cc ptzproxy.cc sonarproxy.cc soundproxy.cc speechproxy.cc truthproxy.cc waveformproxy.cc wifiproxy.cc Log Message: removed Player code to link directly with the library --- bumperproxy.cc DELETED --- --- commsproxy.cc DELETED --- --- localizeproxy.cc DELETED --- --- waveformproxy.cc DELETED --- --- idarproxy.cc DELETED --- --- speechproxy.cc DELETED --- --- audiomixerproxy.cc DELETED --- --- blobfinderproxy.cc DELETED --- --- soundproxy.cc DELETED --- --- audiodspproxy.cc DELETED --- --- laserproxy.cc DELETED --- --- ptzproxy.cc DELETED --- --- wifiproxy.cc DELETED --- --- idarturretproxy.cc DELETED --- --- descartesproxy.cc DELETED --- --- playermulticlient.cc DELETED --- --- truthproxy.cc DELETED --- --- playerclient.cc DELETED --- --- playerpacket.c DELETED --- --- dioproxy.cc DELETED --- --- audioproxy.cc DELETED --- --- moteproxy.cc DELETED --- --- fiducialproxy.cc DELETED --- --- powerproxy.cc DELETED --- --- irproxy.cc DELETED --- --- mcomproxy.cc DELETED --- --- playercclient.c DELETED --- --- gripperproxy.cc DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 31 Jul 2003 17:07:46 -0000 1.4 --- Makefile.am 26 May 2004 18:48:54 -0000 1.5 *************** *** 21,57 **** PlayerLaser.cc \ PlayerHeading.cc \ ! PlayerGripper.cc \ ! audiodspproxy.cc \ ! commsproxy.cc \ ! idarproxy.cc \ ! moteproxy.cc \ ! speechproxy.cc \ ! audiomixerproxy.cc \ ! descartesproxy.cc \ ! idarturretproxy.cc \ ! positionproxy.cc \ ! truthproxy.cc \ ! audioproxy.cc \ ! dioproxy.cc \ ! irproxy.cc \ ! playerclient.cc \ ! playermulticlient.cc \ ! powerproxy.cc \ ! waveformproxy.cc \ ! blobfinderproxy.cc \ ! fiducialproxy.cc \ ! laserproxy.cc \ ! ptzproxy.cc \ ! wifiproxy.cc \ ! bumperproxy.cc \ ! gpsproxy.cc \ ! localizeproxy.cc \ ! sonarproxy.cc \ ! clientproxy.cc \ ! gripperproxy.cc \ ! mcomproxy.cc \ ! soundproxy.cc \ ! playercclient.c \ ! playerpacket.c --- 21,25 ---- PlayerLaser.cc \ PlayerHeading.cc \ ! PlayerGripper.cc --- sonarproxy.cc DELETED --- --- clientproxy.cc DELETED --- --- positionproxy.cc DELETED --- --- gpsproxy.cc DELETED --- |
|
From: Dominic L?t. <ma...@us...> - 2004-05-26 18:49:20
|
Update of /cvsroot/robotflow/RobotFlow/Player/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28810/include Modified Files: Makefile.am Removed Files: player.h playercclient.h playerclient.h playercommon.h playerpacket.h replace.h Log Message: removed Player code to link directly with the library --- player.h DELETED --- --- replace.h DELETED --- --- playerclient.h DELETED --- --- playercommon.h DELETED --- --- playercclient.h DELETED --- --- playerpacket.h DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Player/include/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 2 Jul 2003 19:59:32 -0000 1.2 --- Makefile.am 26 May 2004 18:48:54 -0000 1.3 *************** *** 1,9 **** AUTOMAKE_OPTIONS = no-dependencies ! noinst_HEADERS = PlayerConnect.h \ ! playercclient.h \ ! playerclient.h \ ! playercommon.h \ ! player.h \ ! playerpacket.h \ ! replace.h --- 1,3 ---- AUTOMAKE_OPTIONS = no-dependencies ! noinst_HEADERS = PlayerConnect.h |
