Update of /cvsroot/playerstage/code/stage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26605
Modified Files:
Makefile.am configure.ac todo
Added Files:
glutgraphics.cfg stage_logo.png
Removed Files:
stage.xpm
Log Message:
merge done
--- stage.xpm DELETED ---
Index: configure.ac
===================================================================
RCS file: /cvsroot/playerstage/code/stage/configure.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** configure.ac 14 Jan 2008 20:23:01 -0000 1.18
--- configure.ac 15 Jan 2008 01:25:42 -0000 1.19
***************
*** 5,11 ****
dnl AC_INIT( package, version )
! AC_INIT(stage,2.1.0rc1)
!
! AC_CONFIG_SRCDIR(src/stage.c)
dnl determine system type. this is used in a couple of places to infer the
--- 5,13 ----
dnl AC_INIT( package, version )
! AC_INIT(Stage,3.0.0)
!
! dnl Check for a source file, to make sure any user-specified source
! dnl dir is correct
! AC_CONFIG_SRCDIR(libstage/model.cc)
dnl determine system type. this is used in a couple of places to infer the
***************
*** 48,90 ****
fi
! dnl add prefix to the pkg-config path in case things were installed there
! dnl and the user didn't add it manually
! export PKG_CONFIG_PATH=$prefix/lib/pkgconfig:$PKG_CONFIG_PATH
! dnl check for GTK stuff - we need it for the GUI
! PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4, ,
! AC_MSG_WARN([A suitable GTK+ was not found. GTK+-2.4 or later is required. ])
)
!
! dnl if GNOMECANVAS is requested and available, we use that for graphics
! AC_ARG_ENABLE(gnomecanvas,
! AC_HELP_STRING([--enable-gnomecanvas],[Use GnomeCanvas if
available *EXPERIMENTAL (rtv)*]),
! [ if test "x$enableval" = "xyes"; then
! PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= 2.0,
! gnome=true
! AC_DEFINE(INCLUDE_GNOME,1,[building GnomeCanvas components]),
! AC_MSG_WARN([no suitable GnomeCanvas library was found. ])
! )
! AC_MSG_RESULT([GnomeCanvas graphics will be used.])
! else
! gnome=false
! AC_MSG_RESULT([GnomeCanvas graphics disabled by user])
! fi ],
! )
! AM_CONDITIONAL(GNOME, test x$gnome = xtrue)
dnl for libstageplugin, we need Player 2.1 or higher
PKG_CHECK_MODULES( PLAYER, playercore >= 2.1.0,
AC_DEFINE(INCLUDE_PLAYER,1,[building Player plugin])
! have_player=yes
! ,
AC_MSG_WARN([No suitable Player installation detected.])
have_player=no
)
! AM_CONDITIONAL(HAVE_PLAYER, [test $have_player = yes])
!
dnl for libplayerc examples, we need libplayerc
--- 50,84 ----
fi
! dnl ==== GRAPHICS FILES ====
! PKG_CHECK_MODULES(PIXBUF, gdk-pixbuf-2.0 >= 1.0, ,
! AC_MSG_ERROR([Required library gdk-pixbuf-2.0 not found. Install it and try
again.])
)
! dnl ==== FLTK GUI ====
! AC_CHECK_PROGS(HAVE_FLTK_CONFIG, fltk-config, "")
! if test -n "$HAVE_FLTK_CONFIG"; then
! AC_SUBST(FLTK_CFLAGS,"`fltk-config --use-gl --use-images --cxxflags`")
! AC_SUBST(FLTK_LIBS,"`fltk-config --use-gl --use-images --ldflags`")
! else
! AC_MSG_ERROR(Could not find fltk-config. Check that FLTK is installed.)
! fi
!
! dnl ==== PLAYER ====
!
! dnl add prefix to the pkg-config path in case things were installed there
! dnl and the user didn't add it manually
! export PKG_CONFIG_PATH=$prefix/lib/pkgconfig:$PKG_CONFIG_PATH
dnl for libstageplugin, we need Player 2.1 or higher
PKG_CHECK_MODULES( PLAYER, playercore >= 2.1.0,
AC_DEFINE(INCLUDE_PLAYER,1,[building Player plugin])
! have_player=yes,
AC_MSG_WARN([No suitable Player installation detected.])
have_player=no
)
! AM_CONDITIONAL(HAVE_PLAYER, [test $have_player=yes])
dnl for libplayerc examples, we need libplayerc
***************
*** 99,116 ****
AM_CONDITIONAL(HAVE_PLAYERC, [test $have_playerc = yes])
- dnl where's the X11 color database?
- AC_CHECK_FILE([/usr/X11R6/lib/X11/rgb.txt],
- CDB="\"/usr/X11R6/lib/X11/rgb.txt\"",
- AC_CHECK_FILE([/usr/openwin/lib/X11/rgb.txt],
- CDB="\"/usr/openwin/lib/X11/rgb.txt\"",
- AC_CHECK_FILE([/usr/share/X11/rgb.txt],
- CDB="\"/usr/share/X11/rgb.txt\"",
- CDB="\"/usr/X11R6/lib/X11/rgb.txt\"")))
- AC_ARG_WITH(color, [ --with-color=file Location of X11-style color
file],
- CDB="\"$with_color\"",)
- AC_DEFINE_UNQUOTED(COLOR_DATABASE,$CDB,[the X11-style color database])
-
AC_OUTPUT(Makefile
! src/Makefile
docsrc/Makefile
worlds/Makefile
--- 93,99 ----
AM_CONDITIONAL(HAVE_PLAYERC, [test $have_playerc = yes])
AC_OUTPUT(Makefile
! libstage/Makefile
! libstageplugin/Makefile
docsrc/Makefile
worlds/Makefile
***************
*** 129,137 ****
AC_MSG_RESULT([])
AC_MSG_RESULT([Stage will be built for a $host system, with the following
tools and options:])
! AC_MSG_RESULT([ C compiler: $CC $CFLAGS])
! AC_MSG_RESULT([ C++ compiler: $CXX $CXXFLAGS])
AC_MSG_RESULT([])
! if test "x$have_player" = "xyes"; then
AC_MSG_RESULT([The Player plugin (libstageplugin) will be built using the
following flags: ])
AC_MSG_RESULT([ compiler: $PLAYER_CFLAGS])
--- 112,119 ----
AC_MSG_RESULT([])
AC_MSG_RESULT([Stage will be built for a $host system, with the following
tools and options:])
! AC_MSG_RESULT([ C++ compiler: $CXX $CXXFLAGS $PIXBUF_CFLAGS $FLTK_CFLAGS ])
AC_MSG_RESULT([])
! if test $have_player = yes; then
AC_MSG_RESULT([The Player plugin (libstageplugin) will be built using the
following flags: ])
AC_MSG_RESULT([ compiler: $PLAYER_CFLAGS])
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Makefile.am 28 Jul 2006 22:04:01 -0000 1.38
--- Makefile.am 15 Jan 2008 01:25:42 -0000 1.39
***************
*** 1,3 ****
! SUBDIRS = replace src worlds docsrc examples
# create the pkg-config entries
--- 1,3 ----
! SUBDIRS = replace libstage libstageplugin worlds docsrc examples
# create the pkg-config entries
--- NEW FILE: stage_logo.png ---
(This appears to be a binary file; contents omitted.)
Index: todo
===================================================================
RCS file: /cvsroot/playerstage/code/stage/todo,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** todo 24 Jan 2006 08:08:24 -0000 1.7
--- todo 15 Jan 2008 01:25:42 -0000 1.8
***************
*** 1,14 ****
-- TODO --
- gripper
- - localization
- power
! - polylines
!
! - sell large scale sims to industry?
! - 0.01M robots
! - pacman world
!
! - boundary property
- sensible defaults - laser (all devices)
--- 1,15 ----
-- TODO --
+ - libstageplugin
+ - better model lookup
+ - collisons
+ - 3d ray tracing
+ - fiducials
+ - GUI rotations
+ - docs
- gripper
- power
! - energy
! - pucks
- sensible defaults - laser (all devices)
***************
*** 16,27 ****
header file
! - docs
!
! - energy
!
! - pucks
!
! - gripper
!
-- DONE --
--- 17,24 ----
header file
! -- Large Scale Robotics paper
! - 0.01M robots
! - two or three benchmark controllers
! - experimental design
-- DONE --
--- NEW FILE: glutgraphics.cfg ---
# Instantiate the example driver, which supports the position interface
driver
(
name "glutgraphics"
plugin "libglutgraphics"
provides ["graphics3d:0"]
#foo 1
alwayson 1
)
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
![[Playerstage-commit] code/stage glutgraphics.cfg, 1.1, 1.2 stage_logo.png, 1.1, 1.2 Makefile.am, 1.38, 1.39 configure.ac, 1.18, 1.19 todo, 1.7, 1.8 stage.xpm, 1.1, NONE](/search?l=playerstage-commit@lists.sourceforge.net&q=subject:%22%5C%5BPlayerstage%5C-commit%5C%5D+code%5C%2Fstage+glutgraphics.cfg%2C+1.1%2C%091.2+stage_logo.png%2C+1.1%2C+1.2+Makefile.am%2C+1.38%2C%091.39+configure.ac%2C+1.18%2C+1.19+todo%2C+1.7%2C+1.8+stage.xpm%2C+1.1%2C+NONE%22&o=newest){kind=link}
