From: <he...@us...> - 2009-01-28 17:24:42
|
Revision: 37 http://simspark.svn.sourceforge.net/simspark/?rev=37&view=rev Author: hedayat Date: 2009-01-28 17:24:13 +0000 (Wed, 28 Jan 2009) Log Message: ----------- Removed autotools support in spark: changed MaxStepsPerCycle from 3 to 1 (TC decision) in rcssserver3d: enabled RestrictedVisionPerceptor (TC decision) and ObjectStates (Is it OK?!) Modified Paths: -------------- trunk/rcssserver3d/ChangeLog trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg trunk/rcssserver3d/data/rsg/agent/nao/naoarm.rsg trunk/rcssserver3d/data/rsg/agent/nao/naoleg.rsg trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg trunk/spark/ChangeLog trunk/spark/spark/spark.rb Added Paths: ----------- trunk/rcssserver3d/INSTALL trunk/rsgedit/INSTALL trunk/simspark-utilities/INSTALL trunk/spark/INSTALL Removed Paths: ------------- trunk/rcssserver3d/INSTALL trunk/rcssserver3d/Makefile.am trunk/rcssserver3d/acinclude.m4 trunk/rcssserver3d/bootstrap trunk/rcssserver3d/config.aux/ trunk/rcssserver3d/configure.ac trunk/rcssserver3d/data/Makefile.am trunk/rcssserver3d/doc/Makefile.am trunk/rcssserver3d/doc/users/Makefile.am trunk/rcssserver3d/plugin/Makefile.am trunk/rcssserver3d/plugin/soccer/Makefile.am trunk/rcssserver3d/plugin/soccermonitor/Makefile.am trunk/rcssserver3d/rcssagent3d/Makefile.am trunk/rcssserver3d/rcssmonitor3d/Makefile.am trunk/rcssserver3d/simspark/Makefile.am trunk/rsgedit/INSTALL trunk/rsgedit/Makefile.am trunk/rsgedit/acinclude.m4 trunk/rsgedit/bootstrap trunk/rsgedit/config.aux/ trunk/rsgedit/configure.ac trunk/rsgedit/res/Makefile.am trunk/rsgedit/src/Makefile.am trunk/rsgedit/wxutil/Makefile.am trunk/spark/INSTALL trunk/spark/Makefile.am trunk/spark/acinclude.m4 trunk/spark/bootstrap trunk/spark/config.aux/ trunk/spark/configure.ac trunk/spark/data/Makefile.am trunk/spark/doc/Makefile.am trunk/spark/doc/devel/Makefile.am trunk/spark/doc/devel/howtos/Makefile.am trunk/spark/doc/papers/proposal/Makefile.am trunk/spark/lib/Makefile.am trunk/spark/lib/kerosin/Makefile.am trunk/spark/lib/oxygen/Makefile.am trunk/spark/lib/salt/Makefile.am trunk/spark/lib/zeitgeist/Makefile.am trunk/spark/plugin/Makefile.am trunk/spark/plugin/collisionperceptor/Makefile.am trunk/spark/plugin/filesystemrar/Makefile.am trunk/spark/plugin/filesystemstd/Makefile.am trunk/spark/plugin/filesystemzip/Makefile.am trunk/spark/plugin/forceeffector/Makefile.am trunk/spark/plugin/gyrorateperceptor/Makefile.am trunk/spark/plugin/imageperceptor/Makefile.am trunk/spark/plugin/inputsdl/Makefile.am trunk/spark/plugin/inputwx/Makefile.am trunk/spark/plugin/objimporter/Makefile.am trunk/spark/plugin/openglsyssdl/Makefile.am trunk/spark/plugin/openglsyswx/Makefile.am trunk/spark/plugin/perfectvisionperceptor/Makefile.am trunk/spark/plugin/rosimporter/Makefile.am trunk/spark/plugin/rubysceneimporter/Makefile.am trunk/spark/plugin/sceneeffector/Makefile.am trunk/spark/plugin/sexpparser/Makefile.am trunk/spark/plugin/soundsystembass/Makefile.am trunk/spark/plugin/soundsystemfmod/Makefile.am trunk/spark/plugin/sparkagent/Makefile.am trunk/spark/plugin/sparkmonitor/Makefile.am trunk/spark/spark/Makefile.am trunk/spark/test/Makefile.am trunk/spark/test/coretest/Makefile.am trunk/spark/test/fonttest/Makefile.am trunk/spark/test/inputtest/Makefile.am trunk/spark/test/scenetest/Makefile.am trunk/spark/test/zeitgeisttest/Makefile.am trunk/spark/utility/Makefile.am trunk/spark/utility/libobj/Makefile.am trunk/spark/utility/rcssnet/Makefile.am trunk/spark/utility/sfsexp/Makefile.am trunk/spark/utility/tinyxml/Makefile.am Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Added: svn:ignore + .project Modified: trunk/rcssserver3d/ChangeLog =================================================================== --- trunk/rcssserver3d/ChangeLog 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/ChangeLog 2009-01-28 17:24:13 UTC (rev 37) @@ -1,3 +1,16 @@ +2009-01-28 Hedayat Vatankhah <he...@gr...> + + * INSTALL: + - added new installation instructions (cmake oriented) + + * data/rsg/agent/nao/nao.rsg: + - disable VisionPerceptor + + * data/rsg/agent/nao/naoneckhead.rsg: + * data/rsg/agent/nao/naoleg.rsg: + * data/rsg/agent/nao/naoarm.rsg: + - enabled RestrictedVisionPerceptor and ObjectState nodes + 2009-01-24 Hedayat Vatankhah <he...@gr...> * CMakeLists.txt: Deleted: trunk/rcssserver3d/INSTALL =================================================================== --- trunk/rcssserver3d/INSTALL 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/INSTALL 2009-01-28 17:24:13 UTC (rev 37) @@ -1,236 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - Added: trunk/rcssserver3d/INSTALL =================================================================== --- trunk/rcssserver3d/INSTALL (rev 0) +++ trunk/rcssserver3d/INSTALL 2009-01-28 17:24:13 UTC (rev 37) @@ -0,0 +1,29 @@ +Installation Instructions +========================== +You can build this package using CMake build system (version 2.6 or higher +should be installed on your system). CMake can generate different kinds of +native build files for your system (e.g. Unix Makefiles, Eclipse CDT 4.0 project +files, Visual Studio project files). You can generate build files using CMake +command-line or GUI interfaces. + +Basic Installation Using CMake Command-line Interface +===================================================== +1. Unpack the distribution and change directory to the top level source tree. +2. (Recommended) Create a directory to hold your build files (e.g. 'mkdir build') +3. Change directory to the directory you created in the previous step (for the +above example, you can use 'cd build') +4. Run 'cmake ..' to configure the package and generate build files. On Linux, +it'll generate Makefiles for the package +5. Optionally, you can run 'ccmake .' to edit the build settings (for example +the installation directory). +6. Considering that you've generated Makefiles using cmake, you can run 'make' +to build the package. +7. Run 'make install' to install the package. + +Also, you can run 'make uninstall' to uninstall the package. + +Documentation +============= +After creating build files, there will be two extra targets (if you have their +requirements): doc and pdf. If you want to create API documentation (using +doxygen) you can run 'make doc'. To create PDF documentation, run 'make pdf'. \ No newline at end of file Deleted: trunk/rcssserver3d/Makefile.am =================================================================== --- trunk/rcssserver3d/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1,38 +0,0 @@ -### utility subdir has to be made first -SUBDIRS = data doc plugin rcssagent3d rcssmonitor3d simspark - -pkginclude_HEADERS = \ -rcssserver3d_config.h - -doc: doc-recursive -doc-recursive: - cd doc && $(MAKE) $(AM_MAKEFLAGS) doc - -CLEANFILES = - -DISTCLEANFILES = $(top_builddir)/macosX/SDLMain.o $(top_builddir)/macosX/libSDLmain.a -EXTRA_DIST = macosX/fwcopy macosX/mkapp macosX/plugincopy \ - macosX/SDLMain.h macosX/SDLMain.m \ - windows/rcssserver3d_config.h windows/simspark.iss windows/spark.ico -dist_doc_DATA = AUTHORS ChangeLog COPYING NEWS README THANKS TODO - -EXTRA_SRC_DISTS = -EXTRA_BIN_DISTS = -include $(top_srcdir)/config.aux/dist.am - -UPLOAD_BIN = -UPLOAD_SRC = upload-gzip upload-bzip2 upload-zip -UPLOAD_TARGETS = \ -{gzip=>@PACKAGE@-@VERSION@.tar.gz} \ -{bzip2=>@PACKAGE@-@VERSION@.tar.bz2} \ -{zip=>@PACKAGE@-@VERSION@.zip} -include $(top_srcdir)/config.aux/sf.am - - -include $(top_srcdir)/config.aux/cvs.am - -#MSI_SETUP_FILE=Setup/Release/@PAC...@Se...i -#include $(top_srcdir)/config.aux/msi.am - -#include $(top_srcdir)/config.aux/rpm.am - Deleted: trunk/rcssserver3d/acinclude.m4 =================================================================== --- trunk/rcssserver3d/acinclude.m4 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/acinclude.m4 2009-01-28 17:24:13 UTC (rev 37) @@ -1,140 +0,0 @@ -# SPARK_LIB_SALT -# Substitutes: @SALT_LDFLAGS@ -# @SALT_CPPFLAGS@ -#----------------------------------------------------------------------------- -AC_DEFUN([SPARK_LIB_SALT], [ - # check for the salt-config script - AC_PATH_PROG(SALT,[salt-config],[no]) - if test $SALT = "no"; then - AC_MSG_ERROR([salt-config not found]) - fi - # get the libs file - AC_MSG_CHECKING([libsalt libs file]) - - spark_salt_libflags=`$SALT --libs` - AC_MSG_RESULT([$spark_salt_libflags]) - AC_SUBST(SALT_LDFLAGS, [$spark_salt_libflags]) - - spark_salt_cppflags=`$SALT --cflags` - AC_MSG_RESULT([$spark_salt_cppflags]) - AC_SUBST(SALT_CPPFLAGS, [$spark_salt_cppflags]) -]) # SPARK_LIB_SALT - -# SPARK_LIB_ZEITGEIST -# Substitutes: @ZEITGEIST_LDFLAGS@ -# @ZEITGEIST_CPPFLAGS@ -#----------------------------------------------------------------------------- -AC_DEFUN([SPARK_LIB_ZEITGEIST], [ - # check for the zeitgeist-config script - AC_PATH_PROG(ZEITGEIST,[zeitgeist-config],[no]) - if test $ZEITGEIST = "no"; then - AC_MSG_ERROR([zeitgeist-config not found]) - fi - # get the libs file - AC_MSG_CHECKING([libzeitgeist libs file]) - - spark_zeitgeist_libflags=`$ZEITGEIST --libs` - AC_MSG_RESULT([$spark_zeitgeist_libflags]) - AC_SUBST(ZEITGEIST_LDFLAGS, [$spark_zeitgeist_libflags]) - - spark_zeitgeist_cppflags=`$ZEITGEIST --cflags` - AC_MSG_RESULT([$spark_zeitgeist_cppflags]) - AC_SUBST(ZEITGEIST_CPPFLAGS, [$spark_zeitgeist_cppflags]) -]) # SPARK_LIB_ZEITGEIST - -# SPARK_LIB_OXYGEN -# Substitutes: @OXYGEN_LDFLAGS@ -# @OXYGEN_CPPFLAGS@ -#----------------------------------------------------------------------------- -AC_DEFUN([SPARK_LIB_OXYGEN], [ - # check for the oxygen-config script - AC_PATH_PROG(OXYGEN,[oxygen-config],[no]) - if test $OXYGEN = "no"; then - AC_MSG_ERROR([oxygen-config not found]) - fi - # get the libs file - AC_MSG_CHECKING([liboxygen libs file]) - - spark_oxygen_libflags=`$OXYGEN --libs` - AC_MSG_RESULT([$spark_oxygen_libflags]) - AC_SUBST(OXYGEN_LDFLAGS, [$spark_oxygen_libflags]) - - spark_oxygen_cppflags=`$OXYGEN --cflags` - AC_MSG_RESULT([$spark_oxygen_cppflags]) - AC_SUBST(OXYGEN_CPPFLAGS, [$spark_oxygen_cppflags]) -]) # SPARK_LIB_OXYGEN - -# SPARK_LIB_KEROSIN -# Substitutes: @KEROSIN_LDFLAGS@ -# @KEROSIN_CPPFLAGS@ -#----------------------------------------------------------------------------- -AC_DEFUN([SPARK_LIB_KEROSIN], [ - # check for the kerosin-config script - AC_PATH_PROG(KEROSIN,[kerosin-config],[no]) - if test $KEROSIN = "no"; then - AC_MSG_ERROR([kerosin-config not found]) - fi - # get the libs file - AC_MSG_CHECKING([libkerosin libs file]) - - spark_kerosin_libflags=`$KEROSIN --libs` - AC_MSG_RESULT([$spark_kerosin_libflags]) - AC_SUBST(KEROSIN_LDFLAGS, [$spark_kerosin_libflags]) - - spark_kerosin_cppflags=`$KEROSIN --cflags` - AC_MSG_RESULT([$spark_kerosin_cppflags]) - AC_SUBST(KEROSIN_CPPFLAGS, [$spark_kerosin_cppflags]) - - AC_DEFINE(HAVE_KEROSIN_KEROSIN_H, 1, [Define to 1 if using the kerosin header]) -]) # SPARK_LIB_KEROSIN - -# SPARK_LIB_SPARK -# Substitutes: @SPARK_LDFLAGS@ -# @SPARK_CPPFLAGS@ -#----------------------------------------------------------------------------- -AC_DEFUN([SPARK_LIB_SPARK], [ - # check for the spark-config script - AC_PATH_PROG(SPARK,[spark-config],[no]) - if test $SPARK = "no"; then - AC_MSG_ERROR([spark-config not found]) - fi - # get the libs file - AC_MSG_CHECKING([libspark libs file]) - - spark_libflags=`$SPARK --libs` - AC_MSG_RESULT([$spark_libflags]) - AC_SUBST(SPARK_LDFLAGS, [$spark_libflags]) - - spark_cppflags=`$SPARK --cflags` - AC_MSG_RESULT([$spark_cppflags]) - AC_SUBST(SPARK_CPPFLAGS, [$spark_cppflags]) -]) # SPARK_LIB_SPARK - -# RCSS_PATH_FREETYPE -# Substitutes: @FREETYPE_CPPFLAGS@ -# @FREETYPE_LDFLAGS@ -# -#----------------------------------------------------------------------------- -AC_DEFUN([RCSS_PATH_FREETYPE], [ - # --with-freetype=PATH - AC_ARG_WITH(freetype, - AC_HELP_STRING([--with-freetype=PATH], - [path to freetype-config (default is freetype-config)]), - [freetype="$withval"], - [freetype="freetype-config"] - ) - AC_PATH_PROGS(FREETYPE,[$freetype freetype-config],no) - if test $FREETYPE = "no"; then - AC_MSG_ERROR([need freetype2 devel library to compile libkerosin]) - else - rcss_freetype_cppflags=`$FREETYPE --cflags` - rcss_freetype_libadd=`$FREETYPE --libs` - AC_MSG_CHECKING([freetype include flags]) - AC_MSG_RESULT([$rcss_freetype_cppflags]) - AC_SUBST(FREETYPE_CPPFLAGS, [$rcss_freetype_cppflags]) - AC_MSG_CHECKING([freetype libs file]) - AC_MSG_RESULT([$rcss_freetype_libadd]) - AC_SUBST(FREETYPE_LDFLAGS, [$rcss_freetype_libadd]) - fi -]) # RCSS_PATH_FREETYPE - Deleted: trunk/rcssserver3d/bootstrap =================================================================== --- trunk/rcssserver3d/bootstrap 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/bootstrap 2009-01-28 17:24:13 UTC (rev 37) @@ -1,11 +0,0 @@ -#! /bin/sh - -force="" -if test "$1" = "--force"; then force="$1"; fi - -aclocal -libtoolize --copy $force -aclocal -autoheader $force -autoconf $force -automake --add-missing --copy $force Deleted: trunk/rcssserver3d/configure.ac =================================================================== --- trunk/rcssserver3d/configure.ac 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/configure.ac 2009-01-28 17:24:13 UTC (rev 37) @@ -1,85 +0,0 @@ -# Process this file with autoconf to produce a configure script. -AC_INIT([rcssserver3d], 0.6, [sim...@li...]) -AC_CONFIG_SRCDIR([simspark/main.cpp]) -AC_CONFIG_HEADER([rcssserver3d_config.h]) -AC_CONFIG_AUX_DIR([config.aux]) - -AM_INIT_AUTOMAKE([gnu subdir-objects 1.7]) -AC_LANG([C++]) -AM_ENABLE_SHARED(yes) -AM_ENABLE_STATIC(no) - -# Checks for programs. -AC_PROG_CXX -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_INSTALL -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL -AC_CHECK_PROG([DOXYGEN], [doxygen], [yes], [no]) -AC_CHECK_PROG([PDFLATEX], [pdflatex], [yes]) -AM_CONDITIONAL(DOXYGEN, test x$DOXYGEN = xyes ) -AM_CONDITIONAL(COND_PDFLATEX, test x$PDFLATEX != x) - -# Checks for simspark libraries. -SPARK_LIB_SALT -SPARK_LIB_ZEITGEIST -SPARK_LIB_OXYGEN -SPARK_LIB_KEROSIN -SPARK_LIB_SPARK - -# Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS([float.h limits.h malloc.h memory.h stdlib.h string.h]) -AC_CHECK_HEADERS([execinfo.h]) -AC_CHECK_HEADERS([CoreFoundation/CoreFoundation.h]) - -AC_CHECK_HEADER([boost/version.hpp],, - AC_MSG_ERROR([boost library not found. Please specify the location -of the boost header directory using the CPPFLAGS environment variable])) -AC_CHECK_HEADERS([backward/hash_map hash_map],break, - AC_MSG_NOTICE(['hash_map' will be substituted by 'map'. If you need hash_map install stlport])) - -AC_DEFINE_UNQUOTED(RCSS_BUNDLE_PATH,[PREFIX"/share/"PACKAGE_NAME],["Data dir"]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T - -# Checks for library functions. - -## checks for system services - -# check if we want to build the debug version -AC_ARG_ENABLE([debug], - AS_HELP_STRING([--enable-debug], [Turn on debugging (default is YES)]), - [case "${enableval}" in - yes) debug=true && AC_DEFINE(RCSS_DEBUG, 1, [Define to 1 if we are building a debug version]) ;; - no) debug=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; - esac],[debug=true && AC_DEFINE(RCSS_DEBUG, 1, [Define to 1 if we are building a debug version]) ]) -AC_SUBST(debug, [$debug]) -AM_CONDITIONAL(DEBUG, test x$debug = xtrue) - -# check if we want to build without hardcoding library path using rpath -AC_ARG_ENABLE([rpath], - AS_HELP_STRING([--disable-rpath], [disable using --rpath to hardcode library path in the executables]), - [],[enable_rpath=yes]) -AM_CONDITIONAL(NO_RPATH, test x$enable_rpath = xno) - -RCSS_PATH_FREETYPE - -# create Makefiles and other configuration files -AC_CONFIG_FILES([Makefile \ - rcssagent3d/Makefile \ - rcssmonitor3d/Makefile \ - simspark/Makefile \ - plugin/Makefile \ - plugin/soccer/Makefile \ - plugin/soccermonitor/Makefile \ - data/Makefile \ - doc/Makefile \ - doc/users/Makefile \ - doc/Doxyfile ]) -AC_OUTPUT Deleted: trunk/rcssserver3d/data/Makefile.am =================================================================== --- trunk/rcssserver3d/data/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/data/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1,128 +0,0 @@ -nobase_dist_pkgdata_DATA = \ - models/llowerarm.obj \ - models/rfoot.obj \ - models/naohead.obj \ - models/rlowerarm.obj \ - models/leftgoal.obj \ - models/naosoccerfield.obj \ - models/lupperarm.obj \ - models/soccerbottorso.obj \ - models/rshank.obj \ - models/lshank.obj \ - models/lfoot.obj \ - models/soccerball.obj \ - models/lthigh.obj \ - models/rightgoal.obj \ - models/naobody.obj \ - models/rthigh.obj \ - models/skybox.obj \ - models/rupperarm.obj \ - scripts/rcs-materials-textures.rb \ - scripts/rsgedit-materials.rb \ - scripts/bindings.rb \ - scripts/rcs-materials.rb \ - textures/rcs-grass.png \ - textures/rcs-unum02.png \ - textures/naogoalnet.png \ - textures/skyrender0004.jpg \ - textures/rcs-unum10.png \ - textures/skyrender0006.jpg \ - textures/num11.png \ - textures/rcs-naofield.png \ - textures/rcs-unum06.png \ - textures/rcs-torso-11.png \ - textures/rcs-unum04.png \ - textures/rcs-torso-07.png \ - textures/rcs-torso-10.png \ - textures/rcs-grass-w-lines.tga \ - textures/rcs-unum08.png \ - textures/rcs-torso-02.png \ - textures/skyrender0001.jpg \ - textures/num3.png \ - textures/rcs-torso-09.png \ - textures/rcs-torso-01.png \ - textures/rcs-torso-04.png \ - textures/num4.png \ - textures/skyrender0003.jpg \ - textures/rcs-unum01.png \ - textures/rcs-unum05.png \ - textures/skyrender0005.jpg \ - textures/rcs-unum09.png \ - textures/rcs-soccerball.png \ - textures/rcs-soccerball.tga \ - textures/rcs-grass3.png \ - textures/rcs-torso-03.png \ - textures/num10.png \ - textures/rcs-unum03.png \ - textures/num7.png \ - textures/num9.png \ - textures/rcs-torso-06.png \ - textures/rcs-unum07.png \ - textures/num1.png \ - textures/skyrender0002.jpg \ - textures/num8.png \ - textures/num2.png \ - textures/num5.png \ - textures/num6.png \ - textures/rcs-torso-05.png \ - textures/rcs-unum11.png \ - textures/rcs-torso-08.png \ - materials/soccerball.mtl \ - materials/soccerbottorso.mtl \ - materials/naosoccerfield.mtl \ - materials/rightgoal.mtl \ - materials/leftgoal.mtl \ - materials/nao.mtl \ - materials/skybox.mtl \ - rsg/agent/flag_left2.rsg \ - rsg/agent/flag_right1.rsg \ - rsg/agent/soccerbot056.rsg \ - rsg/agent/ball.rsg \ - rsg/agent/soccerbot058/box_with_uj.rsg \ - rsg/agent/soccerbot058/box.rsg \ - rsg/agent/soccerbot058/head.rsg \ - rsg/agent/soccerbot058/contactjointhandler.rsg \ - rsg/agent/soccerbot058/lowerarm_body.rsg \ - rsg/agent/soccerbot058/foot.rsg \ - rsg/agent/soccerbot058/soccerbottorso.rsg \ - rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg \ - rsg/agent/soccerbot058/lowerarm.rsg \ - rsg/agent/soccerbot058/soccerbot.rsg \ - rsg/agent/soccerbot058/box_with_handler.rsg \ - rsg/agent/soccerbot058/box_with_hj.rsg \ - rsg/agent/soccerbotrightlowerarmcomp.rsg \ - rsg/agent/flag_left.rsg \ - rsg/agent/soccer.rsg \ - rsg/agent/soccerbotleftlowerarmcomp.rsg \ - rsg/agent/soccerbottorso.rsg \ - rsg/agent/flag.rsg \ - rsg/agent/flag_no_viz.rsg \ - rsg/agent/soccerbotcomp.rsg \ - rsg/agent/soccerplayer.rsg \ - rsg/agent/soccerbottorsocomp.rsg \ - rsg/agent/flag_right.rsg \ - rsg/agent/flag_left1.rsg \ - rsg/agent/nao/naoarm.rsg \ - rsg/agent/nao/sphere_appearance.rsg \ - rsg/agent/nao/goal.rsg \ - rsg/agent/nao/hingejoint.rsg \ - rsg/agent/nao/naoleg.rsg \ - rsg/agent/nao/box_physics.rsg \ - rsg/agent/nao/naoneckhead.rsg \ - rsg/agent/nao/sphere_physics_nocollider.rsg \ - rsg/agent/nao/contactjointhandler.rsg \ - rsg/agent/nao/soccer.rsg \ - rsg/agent/nao/dragcontroller.rsg \ - rsg/agent/nao/sphere_physics.rsg \ - rsg/agent/nao/touchperceptorhandler.rsg \ - rsg/agent/nao/ccylinder_physics_nocollider.rsg \ - rsg/agent/nao/ccylinder_appearance.rsg \ - rsg/agent/nao/box_appearance.rsg \ - rsg/agent/nao/universaljoint.rsg \ - rsg/agent/nao/box_physics_nocollider.rsg \ - rsg/agent/nao/box_physics_with_handler.rsg \ - rsg/agent/nao/nao.rsg \ - rsg/agent/nao/ccylinder_physics.rsg \ - rsg/agent/hoap2.rsg \ - rsg/agent/flag_right2.rsg \ - rsg/agent/soccerbot055.rsg Modified: trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg =================================================================== --- trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg 2009-01-28 17:24:13 UTC (rev 37) @@ -76,10 +76,10 @@ (nd SayEffector) - (nd VisionPerceptor - (setSenseMyPos false) - (setStaticSenseAxis false) - (addNoise false)) + ;(nd VisionPerceptor + ; (setSenseMyPos false) + ; (setStaticSenseAxis false) + ; (addNoise false)) );end of AgentAspect Modified: trunk/rcssserver3d/data/rsg/agent/nao/naoarm.rsg =================================================================== --- trunk/rcssserver3d/data/rsg/agent/nao/naoarm.rsg 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/data/rsg/agent/nao/naoarm.rsg 2009-01-28 17:24:13 UTC (rev 37) @@ -227,9 +227,9 @@ 0 0 1 ;2 -1 -1 $aj4_min $aj4_max) - ;(nd ObjectState - ; (setID $LowerarmName) - ; ) + (nd ObjectState + (setID $LowerarmName) + ) ) ) Modified: trunk/rcssserver3d/data/rsg/agent/nao/naoleg.rsg =================================================================== --- trunk/rcssserver3d/data/rsg/agent/nao/naoleg.rsg 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/data/rsg/agent/nao/naoleg.rsg 2009-01-28 17:24:13 UTC (rev 37) @@ -342,9 +342,9 @@ 0 1 0 ;1 -1 -1 $lj6_min $lj6_max) - ;(nd ObjectState - ; (setID $FootName) - ; ) + (nd ObjectState + (setID $FootName) + ) ) Modified: trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg =================================================================== --- trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2009-01-28 17:24:13 UTC (rev 37) @@ -88,16 +88,16 @@ ;(nd Camera) - ;(nd RestrictedVisionPerceptor - ; (setViewCones 120 120) - ; (setSenseMyPos false) - ; (setStaticSenseAxis false) - ; (addNoise true) - ; (setInterval 3) - ;) + (nd RestrictedVisionPerceptor + (setViewCones 120 120) + (setSenseMyPos false) + (setStaticSenseAxis false) + (addNoise true) + (setInterval 3) + ) - ;(nd ObjectState - ; (setID head) - ;) + (nd ObjectState + (setID head) + ) ) ) Deleted: trunk/rcssserver3d/doc/Makefile.am =================================================================== --- trunk/rcssserver3d/doc/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/doc/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1,24 +0,0 @@ -SUBDIRS = users - -all-local: -if DOXYGEN - @echo "***" - @echo "*** To (re-)build the Doxygen API documentation, use 'make doc'" - @echo "***" -endif - -doc: Doxyfile - rm -rf $(srcdir)/api/developers - mkdir -p $(srcdir)/api/developers - cp $(srcdir)/devel/howtos/*.* $(srcdir)/api/developers/ -if DOXYGEN - doxygen Doxyfile -else - touch $(srcdir)/api/index.html -endif - -maintainer-clean-local: - rm -rf api - rm -rf *~ - -EXTRA_DIST = TEXT_INSTEAD_OF_A_MANUAL.txt Deleted: trunk/rcssserver3d/doc/users/Makefile.am =================================================================== --- trunk/rcssserver3d/doc/users/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/doc/users/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1,20 +0,0 @@ -if COND_PDFLATEX -%.toc: %.tex - touch $@ - pdflatex $< - -%.pdf: %.tex %.toc - pdflatex $< - -all-local: - @if test -f user-manual.tex; then \ - $(MAKE) $(AM_MAKEFLAGS) user-manual.pdf ; \ - else \ - echo "***" ;\ - echo "*** The user's manual (PDF) can be found in doc/users." ; \ - echo "***" ; \ - fi - -EXTRA_DIST = user-manual.pdf -CLEANFILES = user-manual.log user-manual.pdf user-manual.aux user-manual.toc -endif \ No newline at end of file Deleted: trunk/rcssserver3d/plugin/Makefile.am =================================================================== --- trunk/rcssserver3d/plugin/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/plugin/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1 +0,0 @@ -SUBDIRS = soccer soccermonitor Deleted: trunk/rcssserver3d/plugin/soccer/Makefile.am =================================================================== --- trunk/rcssserver3d/plugin/soccer/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/plugin/soccer/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1,117 +0,0 @@ -pkglib_LTLIBRARIES = soccer.la - -soccer_la_SOURCES = export.cpp \ -agentstate/agentstate.cpp \ -agentstate/agentstate_c.cpp \ -agentstateperceptor/agentstateperceptor.cpp \ -agentstateperceptor/agentstateperceptor_c.cpp \ -ball/ball.cpp ball/ball_c.cpp \ -ballstateaspect/ballstateaspect.cpp \ -ballstateaspect/ballstateaspect_c.cpp \ -beameffector/beameffector.cpp \ -beameffector/beameffector_c.cpp \ -catcheffector/catcheffector.cpp \ -catcheffector/catcheffector_c.cpp \ -createeffector/createeffector.cpp \ -createeffector/createeffector_c.cpp \ -driveeffector/driveeffector.cpp \ -driveeffector/driveeffector_c.cpp \ -fieldflag/fieldflag_c.cpp \ -gamestateaspect/gamestateaspect.cpp \ -gamestateaspect/gamestateaspect_c.cpp \ -gamestateaspect/gamestateitem.cpp \ -gamestateaspect/gamestateitem_c.cpp \ -gamestateperceptor/gamestateperceptor.cpp \ -gamestateperceptor/gamestateperceptor_c.cpp \ -hearperceptor/hearperceptor.cpp \ -hearperceptor/hearperceptor_c.cpp \ -initeffector/initeffector.cpp \ -initeffector/initeffector_c.cpp \ -initeffector/singlematiniteffector.cpp \ -initeffector/singlematiniteffector_c.cpp \ -initeffector/staticmeshiniteffector.cpp \ -initeffector/staticmeshiniteffector_c.cpp \ -kickeffector/kickeffector.cpp \ -kickeffector/kickeffector_c.cpp \ -objectstate/objectstate.cpp \ -objectstate/objectstate_c.cpp \ -pantilteffector/pantilteffector.cpp \ -pantilteffector/pantilteffector_c.cpp \ -restrictedvisionperceptor/restrictedvisionperceptor.cpp \ -restrictedvisionperceptor/restrictedvisionperceptor_c.cpp \ -sayeffector/sayeffector.cpp \ -sayeffector/sayeffector_c.cpp \ -sexpmonitor/sexpmonitor.cpp \ -sexpmonitor/sexpmonitor_c.cpp \ -internalsoccermonitor/internalsoccerrender.cpp \ -internalsoccermonitor/internalsoccerrender_c.cpp \ -internalsoccermonitor/internalsoccerinput.cpp \ -internalsoccermonitor/internalsoccerinput_c.cpp \ -soccerbase/soccerbase.cpp \ -soccercontrolaspect/soccercontrolaspect.cpp \ -soccercontrolaspect/soccercontrolaspect_c.cpp \ -soccernode/soccernode.cpp \ -soccernode/soccernode_c.cpp \ -soccerruleaspect/soccerruleaspect.cpp \ -soccerruleaspect/soccerruleaspect_c.cpp \ -trainercommandparser/trainercommandparser.cpp \ -trainercommandparser/trainercommandparser_c.cpp \ -visionperceptor/visionperceptor.cpp \ -visionperceptor/visionperceptor_c.cpp \ -gametimeperceptor/gametimeperceptor.cpp \ -gametimeperceptor/gametimeperceptor_c.cpp \ -agentintegration/soccerbotbehavior.cpp \ -agentintegration/soccerbotbehavior_c.cpp - -nobase_libpkginclude_HEADERS = \ -soccertypes.h \ -agentstate/agentstate.h \ -agentstateperceptor/agentstateperceptor.h \ -ball/ball.h \ -ballstateaspect/ballstateaspect.h \ -beameffector/beamaction.h \ -beameffector/beameffector.h \ -catcheffector/catchaction.h \ -catcheffector/catcheffector.h \ -createeffector/createaction.h \ -createeffector/createeffector.h \ -driveeffector/driveaction.h \ -driveeffector/driveeffector.h \ -fieldflag/fieldflag.h \ -gamestateaspect/gamestateaspect.h \ -gamestateaspect/gamestateitem.h \ -gamestateperceptor/gamestateperceptor.h \ -hearperceptor/hearperceptor.h \ -initeffector/initaction.h \ -initeffector/initeffector.h \ -initeffector/singlematiniteffector.h \ -initeffector/staticmeshiniteffector.h \ -kickeffector/kickaction.h \ -kickeffector/kickeffector.h \ -objectstate/objectstate.h \ -pantilteffector/pantiltaction.h \ -pantilteffector/pantilteffector.h \ -restrictedvisionperceptor/restrictedvisionperceptor.h \ -sayeffector/sayaction.h \ -sayeffector/sayeffector.h \ -sexpmonitor/sexpmonitor.h \ -internalsoccermonitor/internalsoccerrender.h \ -internalsoccermonitor/internalsoccerinput.h \ -soccerbase/soccerbase.h \ -soccercontrolaspect/soccercontrolaspect.h \ -soccernode/soccernode.h \ -soccerruleaspect/soccerruleaspect.h \ -trainercommandparser/trainercommandparser.h \ -gametimeperceptor/gametimeperceptor.h \ -visionperceptor/visionperceptor.h \ -agentintegration/soccerbotbehavior.h - -## define include directory local to the pkgincludedir -libpkgincludedir = $(includedir)/@PACKAGE@/soccer - -# -module tells automake we're not building a library but a loadable module -# so we don't need the "lib" prefix in the module name -soccer_la_LDFLAGS = -module -version-info 1:0:0 - -AM_CPPFLAGS = @SALT_CPPFLAGS@ @SPARK_CPPFLAGS@ @ZEITGEIST_CPPFLAGS@ \ - @OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@ @FREETYPE_CPPFLAGS@ Deleted: trunk/rcssserver3d/plugin/soccermonitor/Makefile.am =================================================================== --- trunk/rcssserver3d/plugin/soccermonitor/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/plugin/soccermonitor/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1,28 +0,0 @@ -pkglib_LTLIBRARIES = soccermonitor.la - -soccermonitor_la_SOURCES = export.cpp \ - soccermonitor.cpp \ - soccermonitor_c.cpp \ - soccerrender.cpp \ - soccerrender_c.cpp \ - soccerinput.cpp \ - soccerinput_c.cpp \ - soccerinputlogplayer.cpp \ - soccerinputlogplayer_c.cpp - -nobase_libpkginclude_HEADERS = \ - soccermonitor.h \ - soccerrender.h \ - soccerinput.h \ - soccerinputlogplayer.h - -## define include directory local to the pkgincludedir -libpkgincludedir = $(includedir)/@PACKAGE@/soccermonitor - -# -module tells automake we're not building a library but a loadable module -# so we don't need the "lib" prefix in the module name -soccermonitor_la_LDFLAGS = -module -version-info 1:0:0 - -AM_CPPFLAGS = -I${top_srcdir}/plugin @SALT_CPPFLAGS@ @SPARK_CPPFLAGS@ \ - @ZEITGEIST_CPPFLAGS@ @OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@ \ - @FREETYPE_CPPFLAGS@ Deleted: trunk/rcssserver3d/rcssagent3d/Makefile.am =================================================================== --- trunk/rcssserver3d/rcssagent3d/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/rcssagent3d/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1,30 +0,0 @@ -bin_PROGRAMS = rcssagent3d - -LDADD = -lpthread - -if DEBUG -rcssagent3d_CXXFLAGS = -O -g -W -Wall -else -rcssagent3d_CXXFLAGS = -O2 -endif - -AM_CPPFLAGS = @SALT_CPPFLAGS@ \ - @SPARK_CPPFLAGS@ @ZEITGEIST_CPPFLAGS@ \ - @OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@ - -AM_LDFLAGS = @SALT_LDFLAGS@ \ - @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \ - @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@ - - -rcssagent3d_SOURCES = main.cpp \ - behavior.h \ - soccerbehavior.h \ - soccerbehavior.cpp \ - soccerbotbehavior.h \ - soccerbotbehavior.cpp \ - hoap2behavior.h \ - hoap2behavior.cpp \ - naobehavior.h \ - naobehavior.cpp - Deleted: trunk/rcssserver3d/rcssmonitor3d/Makefile.am =================================================================== --- trunk/rcssserver3d/rcssmonitor3d/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/rcssmonitor3d/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1,32 +0,0 @@ -bin_PROGRAMS = rcssmonitor3d - -LDADD = -lpthread - -if DEBUG -rcssmonitor3d_CXXFLAGS = -O -g -W -Wall -else -rcssmonitor3d_CXXFLAGS = -O2 -endif - -AM_CPPFLAGS = @SALT_CPPFLAGS@ \ - @SPARK_CPPFLAGS@ @ZEITGEIST_CPPFLAGS@ \ - @OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@ - -if NO_RPATH -AM_LDFLAGS = @SALT_LDFLAGS@ \ - @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \ - @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@ -else -AM_LDFLAGS = -Wl,--rpath,$(DESTDIR)$(pkglibdir) \ - @SALT_LDFLAGS@ @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \ - @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@ -endif - -rcssmonitor3d_SOURCES = \ - main.cpp - -dist_pkgdata_DATA = \ - soccersim-monitor.rb \ - rcssmonitor3d.rb \ - soccerbindings.rb - Deleted: trunk/rcssserver3d/simspark/Makefile.am =================================================================== --- trunk/rcssserver3d/simspark/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rcssserver3d/simspark/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1,35 +0,0 @@ -bin_PROGRAMS = simspark - -LDADD = -lpthread - -if DEBUG -agentspark_CXXFLAGS = -O -g -W -Wall -else -agentspark_CXXFLAGS = -O2 -endif - -AM_CPPFLAGS = @SALT_CPPFLAGS@ \ - @SPARK_CPPFLAGS@ @ZEITGEIST_CPPFLAGS@ \ - @OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@ - -if NO_RPATH -AM_LDFLAGS = @SALT_LDFLAGS@ \ - @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \ - @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@ -else -AM_LDFLAGS = -Wl,--rpath,$(DESTDIR)$(pkglibdir) \ - @SALT_LDFLAGS@ @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \ - @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@ -endif - - - -simspark_SOURCES = \ - main.cpp - -dist_pkgdata_DATA = \ - simspark.rb \ - soccersim.rb \ - naosoccersim.rb \ - internalsoccermonitor.rb \ - internalsoccerbindings.rb Deleted: trunk/rsgedit/INSTALL =================================================================== --- trunk/rsgedit/INSTALL 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rsgedit/INSTALL 2009-01-28 17:24:13 UTC (rev 37) @@ -1,236 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - Added: trunk/rsgedit/INSTALL =================================================================== --- trunk/rsgedit/INSTALL (rev 0) +++ trunk/rsgedit/INSTALL 2009-01-28 17:24:13 UTC (rev 37) @@ -0,0 +1,23 @@ +Installation Instructions +========================== +You can build this package using CMake build system (version 2.6 or higher +should be installed on your system). CMake can generate different kinds of +native build files for your system (e.g. Unix Makefiles, Eclipse CDT 4.0 project +files, Visual Studio project files). You can generate build files using CMake +command-line or GUI interfaces. + +Basic Installation Using CMake Command-line Interface +===================================================== +1. Unpack the distribution and change directory to the top level source tree. +2. (Recommended) Create a directory to hold your build files (e.g. 'mkdir build') +3. Change directory to the directory you created in the previous step (for the +above example, you can use 'cd build') +4. Run 'cmake ..' to configure the package and generate build files. On Linux, +it'll generate Makefiles for the package +5. Optionally, you can run 'ccmake .' to edit the build settings (for example +the installation directory). +6. Considering that you've generated Makefiles using cmake, you can run 'make' +to build the package. +7. Run 'make install' to install the package. + +Also, you can run 'make uninstall' to uninstall the package. Deleted: trunk/rsgedit/Makefile.am =================================================================== --- trunk/rsgedit/Makefile.am 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rsgedit/Makefile.am 2009-01-28 17:24:13 UTC (rev 37) @@ -1,26 +0,0 @@ -### utility subdir has to be made first -SUBDIRS = wxutil src res - -pkginclude_HEADERS = rsgedit_config.h - -CLEANFILES = -dist_doc_DATA = doc/rsgedit.txt AUTHORS ChangeLog COPYING NEWS README TODO - -include $(top_srcdir)/config.aux/dist.am - -UPLOAD_BIN = -UPLOAD_SRC = upload-gzip upload-bzip2 upload-zip -UPLOAD_TARGETS = \ -{gzip=>@PACKAGE@-@VERSION@.tar.gz} \ -{bzip2=>@PACKAGE@-@VERSION@.tar.bz2} \ -{zip=>@PACKAGE@-@VERSION@.zip} -include $(top_srcdir)/config.aux/sf.am - - -include $(top_srcdir)/config.aux/cvs.am - -#MSI_SETUP_FILE=Setup/Release/@PAC...@Se...i -#include $(top_srcdir)/config.aux/msi.am - -#include $(top_srcdir)/config.aux/rpm.am - Deleted: trunk/rsgedit/acinclude.m4 =================================================================== --- trunk/rsgedit/acinclude.m4 2009-01-27 10:18:01 UTC (rev 36) +++ trunk/rsgedit/acinclude.m4 2009-01-28 17:24:13 UTC (rev 37) @@ -1,301 +0,0 @@ -# SPARK_LIB_SALT -# Substitutes: @SALT_LDFLAGS@ -# @SALT_CPPFLAGS@ -#----------------------------------------------------------------------------- -AC_DEFUN([SPARK_LIB_SALT], [ - # check for the salt-config script - AC_PATH_PROG(SALT,[salt-config],[no]) - if test $SALT = "no"; then - AC_MSG_ERROR([salt-config not found]) - fi - # get the libs file - AC_MSG_CHECKING([libsalt libs file]) - - spark_salt_libflags=`$SALT --libs` - AC_MSG_RESULT([$spark_salt_libflags]) - AC_SUBST(SALT_LDFLAGS, [$spark_salt_libflags]) - - spark_salt_cppflags=`$SALT --cflags` - AC_MSG_RESULT([$spark_salt_cppflags]) - AC_SUBST(SALT_CPPFLAGS, [$spark_salt_cppflags]) -]) # SPARK_LIB_SALT - -# SPARK_LIB_ZEITGEIST -# Substitutes: @ZEITGEIST_LDFLAGS@ -# @ZEITGEIST_CPPFLAGS@ -#----------------------------------------------------------------------------- -AC_DEFUN([SPARK_LIB_ZEITGEIST], [ - # check for the zeitgeist-config script - AC_PATH_PROG(ZEITGEIST,[zeitgeist-config],[no]) - if test $ZEITGEIST = "no"; then - AC_MSG_ERROR([zeitgeist-config not found]) - fi - # get the libs file - AC_MSG_CHECKING([libzeitgeist libs file]) - - spark_zeitgeist_libflags=`$ZEITGEIST --libs` - AC_MSG_RESULT([$spark_zeitgeist_libflags]) - AC_SUBST(ZEITGEIST_LDFLAGS, [$spark_zeitgeist_libflags]) - - spark_zeitgeist_cppflags=`$ZEITGEIST --cflags` - AC_MSG_RESULT([$spark_zeitgeist_cppflags]) - AC_SUBST(ZEITGEIST_CPPFLAGS, [$spark_zeitgeist_cppflags]) -]) # SPARK_LIB_ZEITGEIST - -# SPARK_LIB_OXYGEN -# Substitutes: @OXYGEN_LDFLAGS@ -# @OXYGEN_CPPFLAGS@ -#----------------------------------------------------------------------------- -AC_DEFUN([SPARK_LIB_OXYGEN], [ - # check for the oxygen-config script - AC_PATH_PROG(OXYGEN,[oxygen-config],[no]) - if test $OXYGEN = "no"; then - AC_MSG_ERROR([oxygen-config not found]) - fi - # get the libs file - AC_MSG_CHECKING([liboxygen libs file]) - - spark_oxygen_libflags=`$OXYGEN --libs` - AC_MSG_RESULT([$spark_oxygen_libflags]) - AC_SUBST(OXYGEN_LDFLAGS, [$spark_oxygen_libflags]) - - spark_oxygen_cppflags=`$OXYGEN --cflags` - AC_MSG_RESULT([$spark_oxygen_cppflags]) - AC_SUBST(OXYGEN_CPPFLAGS, [$spark_oxygen_cppflags]) -]) # SPARK_LIB_OXYGEN - -# SPARK_LIB_KEROSIN -# Substitutes: @KEROSIN_LDFLAGS@ -# @KEROSIN_CPPFLAGS@ -#----------------------------------------------------------------------------- -AC_DEFUN([SPARK_LIB_KEROSIN], [ - # check for the kerosin-config script - AC_PATH_PROG(KEROSIN,[kerosin-config],[no]) - if test $KEROSIN = "no"; then - AC_MSG_ERROR([kerosin-config not found]) - fi - # get the libs file - AC_MSG_CHECKING([libkerosin libs file]) - - spark_kerosin_libflags=`$KEROSIN --libs` - AC_MSG_RESULT([$spark_kerosin_libflags]) - AC_SUBST(KEROSIN_LDFLAGS, [$spark_kerosin_libflags]) - - spark_kerosin_cppflags=`$KEROSIN --cflags` - AC_MSG_RESULT([$spark_kerosin_cppflags]) - AC_SUBST(KEROSIN_CPPFLAGS, [$spark_kerosin_cppflags]) - - AC_DEFINE(HAVE_KEROSIN_KEROSIN_H, 1, [Define to 1 if using the kerosin header]) -]) # SPARK_LIB_KEROSIN - -# SPARK_LIB_SPARK -# Substitutes: @SPARK_LDFLAGS@ -# @SPARK_CPPFLAGS@ -#----------------------------------------------------------------------------- -AC_DEFUN([SPARK_LIB_SPARK], [ - # check for the spark-config script - AC_PATH_PROG(SPARK,[spark-config],[no]) - if test $SPARK = "no"; then - AC_MSG_ERROR([spark-config not found]) - fi - # get the libs file - AC_MSG_CHECKING([libspark libs file]) - - spark_libflags=`$SPARK --libs` - AC_MSG_RESULT([$spark_libflags]) - AC_SUBST(SPARK_LDFLAGS, [$spark_libflags]) - - spark_cppflags=`$SPARK --cflags` - AC_MSG_RESULT([$spark_cppflags]) - AC_SUBST(SPARK_CPPFLAGS, [$spark_cppflags]) -]) # SPARK_LIB_SPARK - -dnl --------------------------------------------------------------------------- -dnl the wxWidgets macros were copied and adapted fr... [truncated message content] |