Menu
▾
▴
simspark-cvs — CVS Commit Notifications via Email
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(153) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(46) |
Mar
(12) |
Apr
(4) |
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(263) |
Mar
(235) |
Apr
(66) |
May
(42) |
Jun
(270) |
Jul
(65) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Markus R. <rol...@us...> - 2005-12-25 16:10:57
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11152/rsgedit Modified Files: rsgedit.rb Log Message: - setup inputserver using no InputSystem (for now) Index: rsgedit.rb =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/rsgedit.rb,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rsgedit.rb 25 Dec 2005 15:06:28 -0000 1.1 --- rsgedit.rb 25 Dec 2005 16:10:45 -0000 1.2 *************** *** 8,13 **** # care of OpenGL setup sparkSetupRendering('') - # sparkSetupInput() # let spark create a default camera --- 8,14 ---- # care of OpenGL setup sparkSetupRendering('') + # setup input using no InputSystem + sparkSetupInput('') # let spark create a default camera |
Update of /cvsroot/simspark/simspark/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3496 Added Files: .cvsignore AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README acinclude.m4 bootstrap configure.ac Log Message: - setup a build environment in simspark/contrib - primordial version of rsgedit added to cvs --- NEW FILE: .cvsignore --- Makefile Makefile.in aclocal.m4 autom4te.cache config.h config.h.in config.log config.status configure libtool stamp-h1 --- NEW FILE: COPYING --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. --- NEW FILE: ChangeLog --- --- NEW FILE: bootstrap --- #! /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 --- NEW FILE: acinclude.m4 --- # SPARK_WXWIDGETS # Substitutes: @WXWIDGETS_LIBADD@ # @WXWIDGETS_CPPFLAGS@ #----------------------------------------------------------------------------- AC_DEFUN([SPARK_WXWIDGETS], [ # check for the wxwidgets AC_PATH_PROG(WXWIDGETS,[wx-config],[no]) if test $WXWIDGETS = "no"; then AC_MSG_ERROR([wx-config not found]) fi # get the libtool file AC_MSG_CHECKING([wxWidgets configuration]) wxwidgets_libadd="`wx-config --libs` `wx-config --gl-libs`" AC_MSG_RESULT([$wxwidgets_libadd]) AC_SUBST(WXWIDGETS_LIBADD, [$wxwidgets_libadd]) wxwidgets_cppflags="`wx-config --cppflags`" AC_MSG_RESULT([$wxwidgets_cppflags]) AC_SUBST(WXWIDGETS_CPPFLAGS, [$wxwidgets_cppflags]) ]) # SPARK_WXWIDGETS # SPARK_LIB_SALT # Substitutes: @SALT_LIBADD@ # @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 libtool file AC_MSG_CHECKING([libsalt libtool file]) spark_salt_libadd=`$SALT --libtool` AC_MSG_RESULT([$spark_salt_libadd]) AC_SUBST(SALT_LIBADD, [$spark_salt_libadd]) 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_LIBADD@ # @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 libtool file AC_MSG_CHECKING([libzeitgeist libtool file]) spark_zeitgeist_libadd=`$ZEITGEIST --libtool` AC_MSG_RESULT([$spark_zeitgeist_libadd]) AC_SUBST(ZEITGEIST_LIBADD, [$spark_zeitgeist_libadd]) 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_LIBADD@ # @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 libtool file AC_MSG_CHECKING([liboxygen libtool file]) spark_oxygen_libadd=`$OXYGEN --libtool` AC_MSG_RESULT([$spark_oxygen_libadd]) AC_SUBST(OXYGEN_LIBADD, [$spark_oxygen_libadd]) 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_LIBADD@ # @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 libtool file AC_MSG_CHECKING([libkerosin libtool file]) spark_kerosin_libadd=`$KEROSIN --libtool` AC_MSG_RESULT([$spark_kerosin_libadd]) AC_SUBST(KEROSIN_LIBADD, [$spark_kerosin_libadd]) spark_kerosin_cppflags=`$KEROSIN --cflags` AC_MSG_RESULT([$spark_kerosin_cppflags]) AC_SUBST(KEROSIN_CPPFLAGS, [$spark_kerosin_cppflags]) ]) # SPARK_LIB_KEROSIN # SPARK_LIB_SPARK # Substitutes: @SPARK_LIBADD@ # @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 libtool file AC_MSG_CHECKING([libspark libtool file]) spark_libadd=`$SPARK --libtool` AC_MSG_RESULT([$spark_libadd]) AC_SUBST(SPARK_LIBADD, [$spark_libadd]) spark_cppflags=`$SPARK --cflags` AC_MSG_RESULT([$spark_cppflags]) AC_SUBST(SPARK_CPPFLAGS, [$spark_cppflags]) ]) # SPARK_LIB_SPARK # SPARK_PATH_RUBY # Substitutes: @RUBY@ ruby command # @RUBY_CPPFLAGS@ additional CPPFLAGS to use to get ruby.h # @RUBY_LDFLAGS@ additional LDFLAGS to use when linking libruby # @RUBY_LDADD@ additional libraries libruby depends on # # original version from the Swig list (major changes by me /oliver) # at http://mailman.cs.uchicago.edu/mailman/listinfo/swig #----------------------------------------------------------------------------- AC_DEFUN([SPARK_PATH_RUBY], [ # --with-ruby=PATH AC_ARG_WITH(ruby, AC_HELP_STRING([--with-ruby=PATH], [path to Ruby interpreter (default is ruby)]), [ruby="$withval"], [ruby="ruby"] ) AC_PATH_PROGS(RUBY,[$ruby ruby],no) # Test ruby interpreter if test $ruby = no; then AC_MSG_ERROR(Could not find Ruby Interpreter. Please use --with-ruby option.) fi # check ruby headers AC_CHECK_HEADER(ruby.h, [RUBY_CPPFLAGS=''], [unset ac_cv_header_ruby_h ruby_tmp=$CPPFLAGS ruby_includedir=`$RUBY -rrbconfig -e "print Config::CONFIG[['archdir']]"` AC_MSG_NOTICE(trying again in $ruby_includedir) RUBY_CPPFLAGS="-I$ruby_includedir" CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS" AC_CHECK_HEADER(ruby.h, [], [AC_MSG_ERROR(check your ruby installation)] ) CPPFLAGS=$ruby_tmp ] ) # set ruby ldflags AC_MSG_CHECKING(ruby library directory) ruby_libdir=`$RUBY -rrbconfig -e "print Config::CONFIG[['archdir']]"` AC_MSG_RESULT($ruby_libdir) RUBY_LDFLAGS="-L$ruby_libdir -lruby" # set ruby additional libraries AC_MSG_CHECKING(libraries ruby depends on) RUBY_LDADD=`$RUBY -rrbconfig -e "print Config::CONFIG[['LIBS']]"` AC_MSG_RESULT($RUBY_LDADD) AC_MSG_CHECKING([for libruby]) spark_tmp="$LDFLAGS" LDFLAGS="$LDFLAGS $RUBY_LDFLAGS" AC_LINK_IFELSE([int main() { return 0; }], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([libruby cannot be found. If you compile ruby on your own, make sure to configure ruby with '--enable-shared' to create the library.])]) LDFLAGS="$spark_tmp" # Substitute Makefile Vars. AC_SUBST(RUBY) AC_SUBST(RUBY_CPPFLAGS) AC_SUBST(RUBY_LDFLAGS) AC_SUBST(RUBY_LDADD) ]) # SPARK_PATH_RUBY AC_DEFUN([SPARK_CHECK_RUBY_VERSION], [ AC_MSG_CHECKING([ruby version]) AC_REQUIRE([SPARK_PATH_RUBY]) MAJOR="$1" RUBY_MAJOR=`$RUBY -rrbconfig -e "print Config::CONFIG[['MAJOR']]"` test -z "$1" && MAJOR="$RUBY_MAJOR" MINOR="$2" RUBY_MINOR=`$RUBY -rrbconfig -e "print Config::CONFIG[['MINOR']]"` test -z "$2" && MINOR="$RUBY_MINOR" TEENY="$3" RUBY_TEENY=`$RUBY -rrbconfig -e "print Config::CONFIG[['TEENY']]"` test -z "$3" && TEENY="$RUBY_TEENY" AC_MSG_RESULT($RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY) if test \( "$RUBY_MAJOR" -lt "$MAJOR" \) -o \ \( "$RUBY_MAJOR" -eq "$MAJOR" -a "$RUBY_MINOR" -lt "$MINOR" \) -o \ \( "$RUBY_MAJOR" -eq "$MAJOR" -a "$RUBY_MINOR" -eq "$MINOR" -a "$RUBY_TEENY" -lt "$TEENY" \); then AC_MSG_ERROR([Your ruby is too old. Use at least ruby-$MAJOR.$MINOR.$TEENY]) fi ]) # SPARK_CHECK_RUBY_VERSION --- NEW FILE: configure.ac --- # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_INIT([simspark-contrip], 0.1) AC_CONFIG_SRCDIR([../spark]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR([config.aux]) AM_INIT_AUTOMAKE([gnu subdir-objects 1.7]) AC_LANG([C++]) # Checks for programs. AC_PROG_CXX AC_PROG_CC AM_PROG_CC_C_O AC_PROG_LIBTOOL SPARK_PATH_RUBY SPARK_WXWIDGETS SPARK_CHECK_RUBY_VERSION(1,8,0) # Checks for simspark libraries. SPARK_LIB_SALT SPARK_LIB_ZEITGEIST SPARK_LIB_OXYGEN SPARK_LIB_KEROSIN SPARK_LIB_SPARK # Checks for header files. # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL AC_C_CONST # create Makefiles and other configuration files AC_CONFIG_FILES([Makefile\ rsgedit/Makefile\ ]) AC_OUTPUT --- NEW FILE: Makefile.am --- SUBDIRS = rsgedit --- NEW FILE: INSTALL --- 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. --- NEW FILE: AUTHORS --- Authors of simspark-contrib: Markus Rollmann <rol...@un...> Also see files ChangeLog and THANKS. --- NEW FILE: README --- --- NEW FILE: NEWS --- |
|
From: Markus R. <rol...@us...> - 2005-12-25 15:06:37
|
Update of /cvsroot/simspark/simspark/contrib/config.aux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3496/config.aux Added Files: .cvsignore Log Message: - setup a build environment in simspark/contrib - primordial version of rsgedit added to cvs --- NEW FILE: .cvsignore --- compile config.guess config.sub depcomp install-sh ltmain.sh missing mkinstalldirs |
|
From: Markus R. <rol...@us...> - 2005-12-25 15:06:37
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3496/rsgedit Added Files: Makefile.am main.cpp main.h mainframe.cpp mainframe.h rsgedit.rb simspark.cpp simspark.h sparkglcanvas.cpp sparkglcanvas.h sparkglrender.cpp sparkglrender.h Log Message: - setup a build environment in simspark/contrib - primordial version of rsgedit added to cvs --- NEW FILE: main.cpp --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: main.cpp,v 1.1 2005/12/25 15:06:28 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #if defined(__GNUG__) && !defined(__APPLE__) #pragma implementation #pragma interface #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #if !wxUSE_GLCANVAS #error "OpenGL required: set wxUSE_GLCANVAS to 1 and rebuild the library" #endif #include "main.h" #include "mainframe.h" #include "sparkglcanvas.h" #include "simspark.h" IMPLEMENT_APP(RsgEditApp) using namespace boost; bool RsgEditApp::OnInit() { mSpark = shared_ptr<SimSpark>(new SimSpark("../../")); if (! mSpark->Init(argc, argv)) { return false; } MainFrame *frame = new MainFrame (NULL, "RSG-Edit", wxDefaultPosition,wxSize(400, 300)); wxMenu *winMenu = new wxMenu; winMenu->Append(wxID_EXIT, _T("&Close")); wxMenuBar *menuBar = new wxMenuBar; menuBar->Append(winMenu, _T("&Window")); frame->SetMenuBar(menuBar); frame->m_canvas = new SparkGLCanvas (frame, wxID_ANY, wxDefaultPosition, wxDefaultSize); // Show the frame frame->Show(true); SetTopWindow(frame); return true; } shared_ptr<SimSpark> RsgEditApp::GetSpark() { return mSpark; } --- NEW FILE: sparkglrender.h --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: sparkglrender.h,v 1.1 2005/12/25 15:06:28 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef SPARKGLRENDER_H__ #define SPARKGLRENDER_H__ #include <boost/shared_ptr.hpp> class SimSpark; namespace oxygen { class Camera; class SceneServer; } namespace kerosin { class RenderServer; } class SparkGLRender { public: SparkGLRender(); virtual ~SparkGLRender(); void Init(boost::shared_ptr<SimSpark> spark); void Render(int width, int height); void AdvanceTime(); protected: boost::shared_ptr<SimSpark> mSpark; boost::shared_ptr<oxygen::Camera> mCamera; boost::shared_ptr<oxygen::SceneServer> mSceneServer; boost::shared_ptr<kerosin::RenderServer> mRenderServer; }; #endif // SPARKGLRENDER_H__ --- NEW FILE: sparkglrender.cpp --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: sparkglrender.cpp,v 1.1 2005/12/25 15:06:28 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "sparkglrender.h" #include <zeitgeist/logserver/logserver.h> #include <oxygen/sceneserver/camera.h> #include <oxygen/sceneserver/sceneserver.h> #include <kerosin/renderserver/renderserver.h> #include "simspark.h" using namespace boost; using namespace zeitgeist; using namespace oxygen; using namespace kerosin; SparkGLRender::SparkGLRender() { } SparkGLRender::~SparkGLRender() { } void SparkGLRender::Init(shared_ptr<SimSpark> spark) { mCamera.reset(); mRenderServer.reset(); mSpark = spark; if (mSpark.get() == 0) { return; } mCamera = shared_dynamic_cast<Camera> (mSpark->GetCore()->Get("/usr/scene/camera/camera")); if (mCamera.get() == 0) { mSpark->GetLog()->Error() << "(SparkGLRender) ERROR: camera node not found\n"; } mRenderServer = shared_dynamic_cast<RenderServer> (mSpark->GetCore()->Get("/sys/server/render")); if (mRenderServer.get() == 0) { mSpark->GetLog()->Error() << "(SparkGLRender) ERROR: RenderServer not found\n"; } mSceneServer = shared_dynamic_cast<SceneServer> (mSpark->GetCore()->Get("/sys/server/scene")); if (mSceneServer.get() == 0) { mSpark->GetLog()->Error() << "(SparkGLRender) ERROR: SceneServer not found\n"; } } void SparkGLRender::Render(int width, int height) { if ( (mCamera.get() == 0) || (mRenderServer.get() == 0) ) { return; } mCamera->SetViewport(0,0,width,height); mRenderServer->Render(); } void SparkGLRender::AdvanceTime() { if (mSceneServer.get() == 0) { return; } mSceneServer->Update(0.1); } --- NEW FILE: sparkglcanvas.cpp --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: sparkglcanvas.cpp,v 1.1 2005/12/25 15:06:28 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <wx/dcclient.h> #include "main.h" #include "sparkglcanvas.h" BEGIN_EVENT_TABLE(SparkGLCanvas, wxGLCanvas) EVT_SIZE(SparkGLCanvas::OnSize) EVT_PAINT(SparkGLCanvas::OnPaint) EVT_ERASE_BACKGROUND(SparkGLCanvas::OnEraseBackground) EVT_ENTER_WINDOW( SparkGLCanvas::OnEnterWindow ) END_EVENT_TABLE() SparkGLCanvas::SparkGLCanvas(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) : wxGLCanvas(parent, (wxGLCanvas*) NULL, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE , name ) { mInit = false; } SparkGLCanvas::SparkGLCanvas(wxWindow *parent, const SparkGLCanvas *other, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxGLCanvas(parent, other->GetContext(), id, pos, size, style|wxFULL_REPAINT_ON_RESIZE , name) { mInit = false; } SparkGLCanvas::~SparkGLCanvas() { } void SparkGLCanvas::Render() { wxPaintDC dc(this); #ifndef __WXMOTIF__ if (!GetContext()) return; #endif SetCurrent(); // Init OpenGL once, but after SetCurrent if (!mInit) { InitGL(); mInit = true; } int w, h; GetClientSize(&w, &h); mRender.Render(w,h); glFlush(); SwapBuffers(); } void SparkGLCanvas::OnPaint( wxPaintEvent& WXUNUSED(event) ) { Render(); } void SparkGLCanvas::OnSize(wxSizeEvent& event) { // this is also necessary to update the context on some platforms wxGLCanvas::OnSize(event); } void SparkGLCanvas::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) { // Do nothing, to avoid flashing. } void SparkGLCanvas::OnEnterWindow( wxMouseEvent& WXUNUSED(event) ) { SetFocus(); } bool SparkGLCanvas::InitGL() { mRender.Init(wxGetApp().GetSpark()); return true; } void SparkGLCanvas::AdvanceTime() { mRender.AdvanceTime(); } --- NEW FILE: simspark.cpp --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: simspark.cpp,v 1.1 2005/12/25 15:06:28 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "simspark.h" #include <zeitgeist/scriptserver/scriptserver.h> #include <oxygen/simulationserver/simulationserver.h> using namespace std; using namespace boost; using namespace spark; SimSpark::SimSpark(const string& relPathPrefix) : Spark(relPathPrefix) { } bool SimSpark::InitApp(int argc, char** argv) { GetSimulationServer()->SetSimStep(0.02); PrintGreeting(); // process command line if (! ProcessCmdLine(argc, argv)) { return false; } // run initialization scripts GetScriptServer()->Run("rsgedit.rb"); return true; } void SimSpark::PrintHelp() { } void SimSpark::PrintGreeting() { } bool SimSpark::ProcessCmdLine(int /*argc*/, char* /*argv*/[]) { return true; } --- NEW FILE: mainframe.h --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: mainframe.h,v 1.1 2005/12/25 15:06:28 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef MAINFRAME_H__ #define MAINFRAME_H__ #include <wx/frame.h> #include <wx/timer.h> class SparkGLCanvas; class MainFrame: public wxFrame { public: void OnExit(wxCommandEvent& event); void OnNewWindow(wxCommandEvent& event); MainFrame(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size, long style = wxDEFAULT_FRAME_STYLE); protected: void OnTimer(wxTimerEvent& event); DECLARE_EVENT_TABLE() public: SparkGLCanvas* m_canvas; protected: wxTimer mTimer; }; #endif // MAINFRAME_H__ --- NEW FILE: rsgedit.rb --- # # rsgedit.rb # sparkSetupServer() # setup rendering using no OpenGLSystem- the wxWidgets GL canvas takes # care of OpenGL setup sparkSetupRendering('') # sparkSetupInput() # let spark create a default camera sparkAddFPSCamera( $scenePath+'camera', x = -5, y = -40, z = 2, maxSpeed = 15.0, accel = 400.0, drag = 4, addCollider = false ) # setup default input bindings # run "bindings.rb" # create custom materials material = new('kerosin/MaterialSolid', $serverPath+'material/matYellow'); material.setDiffuse(1.0,1.0,0.0,1.0) material = new('kerosin/MaterialSolid', $serverPath+'material/matOrange'); material.setDiffuse(1.0,0.3,0.0,1.0) material = new('kerosin/MaterialSolid', $serverPath+'material/matBlue'); material.setDiffuse(0.0,0.0,1.0,1.0) material = new('kerosin/MaterialSolid', $serverPath+'material/matWhite'); material.setDiffuse(1.0,1.0,1.0,1.0) material = new('kerosin/MaterialSolid', $serverPath+'material/matRed'); material.setDiffuse(1.0,0.0,0.0,1.0) material = new('kerosin/MaterialSolid', $serverPath+'material/matRedGlow'); material.setDiffuse(1.0,0.0,0.0,1.0) material.setEmission(0.5,0.0,0.0,1.0) material = new('kerosin/MaterialSolid', $serverPath+'material/matGreen'); material.setDiffuse(0.1,0.5,0.1,1.0) material.setAmbient(0.1,0.4,0.1,1.0) material = new('kerosin/MaterialSolid', $serverPath+'material/matGrey'); material.setDiffuse(0.1,0.1,0.1,1.0) # # uncomment any of the following to run a simulation # scene = get($scenePath) scene.importScene('rsg/boxspheres/simspark.rsg') # create an arena to test various joint bodies # scene = get($scenePath) # scene.importScene('rsg/jointtest/simspark.rsg') --- NEW FILE: mainframe.cpp --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: mainframe.cpp,v 1.1 2005/12/25 15:06:28 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "mainframe.h" #include "sparkglcanvas.h" BEGIN_EVENT_TABLE(MainFrame, wxFrame) EVT_MENU(wxID_EXIT, MainFrame::OnExit) EVT_TIMER(1, MainFrame::OnTimer) END_EVENT_TABLE() // My frame constructor MainFrame::MainFrame(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, wxID_ANY, title, pos, size, style), mTimer(this,1) { m_canvas = NULL; mTimer.Start(100); } // Intercept menu commands void MainFrame::OnExit( wxCommandEvent& WXUNUSED(event) ) { // true is to force the frame to close Close(true); } void MainFrame::OnTimer(wxTimerEvent& /*event*/) { if (m_canvas == 0) { return; } m_canvas->AdvanceTime(); Refresh(); } --- NEW FILE: main.h --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: main.h,v 1.1 2005/12/25 15:06:28 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef MAIN_H__ #define MAIN_H__ #include <wx/glcanvas.h> #include <wx/app.h> #include <boost/shared_ptr.hpp> class SimSpark; class RsgEditApp: public wxApp { public: bool OnInit(); boost::shared_ptr<SimSpark> GetSpark(); protected: boost::shared_ptr<SimSpark> mSpark; }; DECLARE_APP(RsgEditApp) #endif // MAIN_H__ --- NEW FILE: sparkglcanvas.h --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: sparkglcanvas.h,v 1.1 2005/12/25 15:06:28 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef SPARKGLCANVAS_H__ #define SPARKGLCANVAS_H__ #include <wx/glcanvas.h> #include "sparkglrender.h" class SparkGLCanvas: public wxGLCanvas { public: SparkGLCanvas( wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = _T("SparkGLCanvas") ); SparkGLCanvas( wxWindow *parent, const SparkGLCanvas *other, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = _T("SparkGLCanvas") ); virtual ~SparkGLCanvas(); void OnPaint(wxPaintEvent& event); void OnSize(wxSizeEvent& event); void OnEraseBackground(wxEraseEvent& event); void OnEnterWindow(wxMouseEvent& event); void AdvanceTime(); void Render(); bool InitGL(); protected: bool mInit; SparkGLRender mRender; private: DECLARE_EVENT_TABLE() }; #endif // SPARKGLCANVAS_H__ --- NEW FILE: simspark.h --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: simspark.h,v 1.1 2005/12/25 15:06:28 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef SIMSPARK_H__ #define SIMSPARK_H__ #include <spark/spark.h> class SimSpark : public spark::Spark { public: SimSpark(const std::string& relPathPrefix); /** called once after Spark finished it's init */ virtual bool InitApp(int argc, char** argv); /** print command line options */ void PrintHelp(); /** print a greeting */ void PrintGreeting(); /** process command line options */ bool ProcessCmdLine(int argc, char* argv[]); }; #endif // SIMSPARK_H__ --- NEW FILE: Makefile.am --- bin_PROGRAMS = rsgedit AM_CPPFLAGS = -I${top_srcdir}\ @RUBY_CPPFLAGS@\ @WXWIDGETS_CPPFLAGS@\ @SALT_CPPFLAGS@\ @ZEITGEIST_CPPFLAGS@\ @OXYGEN_CPPFLAGS@\ @KEROSIN_CPPFLAGS@\ @SPARK_CPPFLAGS@ AM_LDFLAGS = @SPARK_LIBADD@\ @KEROSIN_LIBADD@\ @OXYGEN_LIBADD@\ @ZEITGEIST_LIBADD@\ @SALT_LIBADD@\ @WXWIDGETS_LIBADD@ rsgedit_SOURCES = \ main.cpp\ mainframe.cpp\ sparkglcanvas.cpp\ simspark.cpp\ sparkglrender.cpp |
|
From: Markus R. <rol...@us...> - 2005-12-25 15:01:42
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3041/rsgedit Log Message: Directory /cvsroot/simspark/simspark/contrib/rsgedit added to the repository |
|
From: Markus R. <rol...@us...> - 2005-12-25 15:01:40
|
Update of /cvsroot/simspark/simspark/contrib/config.aux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3041/config.aux Log Message: Directory /cvsroot/simspark/simspark/contrib/config.aux added to the repository |
|
From: Markus R. <rol...@us...> - 2005-12-25 14:56:12
|
Update of /cvsroot/simspark/simspark/spark/salt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2143/salt Modified Files: salt-config.in Log Message: - added spark-config script template - changed prefix in *-config scripts from rcssserver3d to simspark Index: salt-config.in =================================================================== RCS file: /cvsroot/simspark/simspark/spark/salt/salt-config.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** salt-config.in 19 Dec 2005 19:52:36 -0000 1.1 --- salt-config.in 25 Dec 2005 14:55:51 -0000 1.2 *************** *** 84,88 **** if test "$echo_cflags" = "yes" ; then ! cflags="-I@includedir@/rcssserver3d" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ --- 84,88 ---- if test "$echo_cflags" = "yes" ; then ! cflags="-I@includedir@/simspark" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ *************** *** 98,102 **** libs="-lsalt @SALT_LIBADD@" fi ! echo -L@libdir@/rcssserver3d $libs fi --- 98,102 ---- libs="-lsalt @SALT_LIBADD@" fi ! echo -L@libdir@/simspark $libs fi *************** *** 107,115 **** convlib="libsalt.la" fi ! echo @libdir@/rcssserver3d/$convlib fi if test "$echo_libdir" = "yes" ; then ! echo @libdir@/rcssserver3d fi --- 107,115 ---- convlib="libsalt.la" fi ! echo @libdir@/simspark/$convlib fi if test "$echo_libdir" = "yes" ; then ! echo @libdir@/simspark fi |
|
From: Markus R. <rol...@us...> - 2005-12-25 14:56:12
|
Update of /cvsroot/simspark/simspark/spark/kerosin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2143/kerosin Modified Files: kerosin-config.in Log Message: - added spark-config script template - changed prefix in *-config scripts from rcssserver3d to simspark Index: kerosin-config.in =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin-config.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kerosin-config.in 19 Dec 2005 20:09:17 -0000 1.1 --- kerosin-config.in 25 Dec 2005 14:55:51 -0000 1.2 *************** *** 80,84 **** if test "$echo_cflags" = "yes" ; then ! cflags="-I@includedir@/rcssserver3d" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ --- 80,84 ---- if test "$echo_cflags" = "yes" ; then ! cflags="-I@includedir@/simspark" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ *************** *** 94,98 **** libs="-lkerosin" fi ! echo -L@libdir@/rcssserver3d $libs fi --- 94,98 ---- libs="-lkerosin" fi ! echo -L@libdir@/simspark $libs fi *************** *** 103,107 **** convlib="libkerosin.la" fi ! echo @libdir@/rcssserver3d/$convlib fi --- 103,107 ---- convlib="libkerosin.la" fi ! echo @libdir@/simspark/$convlib fi |
|
From: Markus R. <rol...@us...> - 2005-12-25 14:56:12
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2143/zeitgeist Modified Files: zeitgeist-config.in Log Message: - added spark-config script template - changed prefix in *-config scripts from rcssserver3d to simspark Index: zeitgeist-config.in =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/zeitgeist-config.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** zeitgeist-config.in 19 Dec 2005 20:09:18 -0000 1.1 --- zeitgeist-config.in 25 Dec 2005 14:55:52 -0000 1.2 *************** *** 80,84 **** if test "$echo_cflags" = "yes" ; then ! cflags="-I@includedir@/rcssserver3d" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ --- 80,84 ---- if test "$echo_cflags" = "yes" ; then ! cflags="-I@includedir@/simspark" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ *************** *** 94,98 **** libs="-lzeitgeist" fi ! echo -L@libdir@/rcssserver3d $libs fi --- 94,98 ---- libs="-lzeitgeist" fi ! echo -L@libdir@/simspark $libs fi *************** *** 103,107 **** convlib="libzeitgeist.la" fi ! echo @libdir@/rcssserver3d/$convlib fi --- 103,107 ---- convlib="libzeitgeist.la" fi ! echo @libdir@/simspark/$convlib fi |
|
From: Markus R. <rol...@us...> - 2005-12-25 14:56:12
|
Update of /cvsroot/simspark/simspark/spark/oxygen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2143/oxygen Modified Files: oxygen-config.in Log Message: - added spark-config script template - changed prefix in *-config scripts from rcssserver3d to simspark Index: oxygen-config.in =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/oxygen-config.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** oxygen-config.in 19 Dec 2005 20:09:18 -0000 1.1 --- oxygen-config.in 25 Dec 2005 14:55:51 -0000 1.2 *************** *** 80,84 **** if test "$echo_cflags" = "yes" ; then ! cflags="-I@includedir@/rcssserver3d" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ --- 80,84 ---- if test "$echo_cflags" = "yes" ; then ! cflags="-I@includedir@/simspark" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ *************** *** 94,98 **** libs="-loxygen" fi ! echo -L@libdir@/rcssserver3d $libs fi --- 94,98 ---- libs="-loxygen" fi ! echo -L@libdir@/simspark $libs fi *************** *** 103,107 **** convlib="liboxygen.la" fi ! echo @libdir@/rcssserver3d/$convlib fi --- 103,107 ---- convlib="liboxygen.la" fi ! echo @libdir@/simspark/$convlib fi |
|
From: Markus R. <rol...@us...> - 2005-12-25 14:56:12
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2143 Modified Files: INSTALL configure.ac Log Message: - added spark-config script template - changed prefix in *-config scripts from rcssserver3d to simspark Index: configure.ac =================================================================== RCS file: /cvsroot/simspark/simspark/spark/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure.ac 19 Dec 2005 20:09:16 -0000 1.1 --- configure.ac 25 Dec 2005 14:55:51 -0000 1.2 *************** *** 181,185 **** oxygen/Makefile \ oxygen/oxygen-config \ ! spark/Makefile ], [test -f salt/salt-config && chmod a+x salt/salt-config && \ test -f zeitgeist/zeitgeist-config && chmod a+x zeitgeist/zeitgeist-config && \ --- 181,196 ---- oxygen/Makefile \ oxygen/oxygen-config \ ! spark/Makefile \ ! spark/spark-config \ ! plugin/Makefile \ ! plugin/filesystemstd/Makefile \ ! plugin/sceneeffector/Makefile \ ! plugin/inputsdl/Makefile \ ! plugin/openglsyssdl/Makefile \ ! plugin/sexpparser/Makefile \ ! plugin/rubysceneimporter/Makefile \ ! plugin/sparkmonitor/Makefile \ ! plugin/sparkagent/Makefile \ ! test/coretest/Makefile ], [test -f salt/salt-config && chmod a+x salt/salt-config && \ test -f zeitgeist/zeitgeist-config && chmod a+x zeitgeist/zeitgeist-config && \ Index: INSTALL =================================================================== RCS file: /cvsroot/simspark/simspark/spark/INSTALL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** INSTALL 19 Dec 2005 20:09:16 -0000 1.1 --- INSTALL 25 Dec 2005 14:55:51 -0000 1.2 *************** *** 1,6 **** ! Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software ! Foundation, Inc. ! This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. --- 1,9 ---- ! 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. *************** *** 8,12 **** ================== ! These are generic installation instructions. The `configure' shell script attempts to guess correct values for --- 11,15 ---- ================== ! These are generic installation instructions. The `configure' shell script attempts to guess correct values for *************** *** 68,74 **** ===================== ! 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 --- 71,77 ---- ===================== ! 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 *************** *** 83,87 **** ==================================== ! 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 --- 86,90 ---- ==================================== ! 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 *************** *** 100,116 **** ================== ! By default, `make install' will install the package's files in ! `/usr/local/bin', `/usr/local/man', etc. You can specify an ! installation prefix other than `/usr/local' by giving `configure' the ! option `--prefix=PATH'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you ! give `configure' the option `--exec-prefix=PATH', the package will use ! PATH as the prefix for installing programs and libraries. ! Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give ! options like `--bindir=PATH' 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. --- 103,119 ---- ================== ! 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. *************** *** 123,127 **** ================= ! 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 --- 126,130 ---- ================= ! 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 *************** *** 138,146 **** ========================== ! 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: --- 141,149 ---- ========================== ! 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: *************** *** 157,161 **** If you are _building_ compiler tools for cross-compiling, you should ! use the `--target=TYPE' option to select the type of system they will produce code for. --- 160,164 ---- 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. *************** *** 168,174 **** ================ ! 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 --- 171,177 ---- ================ ! 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 *************** *** 179,183 **** ================== ! 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 --- 182,186 ---- ================== ! 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 *************** *** 187,198 **** ./configure CC=/usr/local2/bin/gcc ! will cause the specified gcc to be used as the C compiler (unless it is ! overridden in the site shell script). `configure' Invocation ====================== ! `configure' recognizes the following options to control how it ! operates. `--help' --- 190,205 ---- ./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' |
|
From: Markus R. <rol...@us...> - 2005-12-25 14:56:05
|
Update of /cvsroot/simspark/simspark/spark/spark In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2143/spark Modified Files: Makefile.am Added Files: spark-config.in Log Message: - added spark-config script template - changed prefix in *-config scripts from rcssserver3d to simspark --- NEW FILE: spark-config.in --- #! /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ usage() { cat <<EOF Usage: spark-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libdir] [--libs] [--libtool] [--cflags] EOF exit $1 } if test $# -eq 0 ; then usage 1 1>&2 fi while test $# -gt 0 ; do case "$1" in -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; *) optarg= ;; esac case $1 in --prefix=*) prefix=$optarg local_prefix=yes ;; --prefix) echo_prefix=yes ;; --exec-prefix=*) exec_prefix=$optarg exec_prefix_set=yes local_prefix=yes ;; --exec-prefix) echo_exec_prefix=yes ;; --version) echo @spark_version@ exit 0 ;; --cflags) echo_cflags=yes ;; --libs) echo_libs=yes ;; --libtool) echo_libtool=yes ;; --libdir) echo_libdir=yes ;; *) usage 1 1>&2 ;; esac shift done if test "$local_prefix" = "yes" ; then if test "$exec_prefix_set" != "yes" ; then exec_prefix=$prefix fi fi if test "$echo_prefix" = "yes" ; then echo $prefix fi if test "$echo_exec_prefix" = "yes" ; then echo $exec_prefix fi if test "$echo_cflags" = "yes" ; then cflags="-I@includedir@/simspark" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ else echo $cflags fi fi if test "$echo_libs" = "yes" ; then if test "@debug@" = "true"; then libs="-lspark_debug @SPARK_LIBADD@" else libs="-lspark @SPARK_LIBADD@" fi echo -L@libdir@/simspark $libs fi if test "$echo_libtool" = "yes" ; then if test "@debug@" = "true"; then convlib="libspark_debug.la" else convlib="libspark.la" fi echo @libdir@/simspark/$convlib fi if test "$echo_libdir" = "yes" ; then echo @libdir@/simspark fi # EOF Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/spark/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 19 Dec 2005 20:09:18 -0000 1.1 --- Makefile.am 25 Dec 2005 14:55:52 -0000 1.2 *************** *** 16,19 **** --- 16,21 ---- endif + bin_SCRIPTS = spark-config + AM_CPPFLAGS = -I${top_srcdir}/lib -I${top_srcdir}/utility \ @FREETYPE_CPPFLAGS@ @RUBY_CPPFLAGS@ |
|
From: Markus R. <rol...@us...> - 2005-12-25 14:54:52
|
Update of /cvsroot/simspark/simspark/spark/plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2069 Modified Files: Makefile.am Log Message: - added sceneeffector plugin Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 13 Dec 2005 21:48:48 -0000 1.1 --- Makefile.am 25 Dec 2005 14:54:35 -0000 1.2 *************** *** 6,10 **** rubysceneimporter\ sparkmonitor\ ! sparkagent --- 6,12 ---- rubysceneimporter\ sparkmonitor\ ! sparkagent\ ! sceneeffector ! |
Update of /cvsroot/simspark/simspark/spark/plugin/sceneeffector In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2069/sceneeffector Added Files: .cvsignore Makefile.am export.cpp sceneaction.h sceneeffector.cpp sceneeffector.h sceneeffector_c.cpp Log Message: - added sceneeffector plugin --- NEW FILE: .cvsignore --- .deps .libs Makefile Makefile.in *.la *.lo --- NEW FILE: sceneaction.h --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2002,2003 Koblenz University Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group $Id: sceneaction.h,v 1.1 2005/12/25 14:54:35 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef SCENEACTION_H #define SCENEACTION_H #include <oxygen/gamecontrolserver/actionobject.h> #include <salt/vector.h> class SceneAction : public oxygen::ActionObject { public: SceneAction(const std::string& predicate, const std::string& scene) : ActionObject(predicate), mScene(scene) {} virtual ~SceneAction() {} /** returns the stored scene name */ const std::string& GetScene() { return mScene; } protected: /** the name of the scene to be created by the SceneEffector */ std::string mScene; }; #endif // SCENEACTION_H --- NEW FILE: export.cpp --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2002,2003 Koblenz University Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group $Id: export.cpp,v 1.1 2005/12/25 14:54:35 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "sceneeffector.h" #include <zeitgeist/zeitgeist.h> ZEITGEIST_EXPORT_BEGIN() ZEITGEIST_EXPORT(SceneEffector); ZEITGEIST_EXPORT_END() --- NEW FILE: sceneeffector.cpp --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2002,2003 Koblenz University Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group $Id: sceneeffector.cpp,v 1.1 2005/12/25 14:54:35 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "sceneeffector.h" #include "sceneaction.h" #include <zeitgeist/logserver/logserver.h> #include <oxygen/gamecontrolserver/actionobject.h> #include <oxygen/agentaspect/agentaspect.h> using namespace boost; using namespace oxygen; using namespace zeitgeist; using namespace std; SceneEffector::SceneEffector() : oxygen::Effector() { } SceneEffector::~SceneEffector() { } bool SceneEffector::Realize(boost::shared_ptr<ActionObject> action) { shared_ptr<SceneAction> sceneAction = shared_dynamic_cast<SceneAction>(action); if (sceneAction.get() == 0) { GetLog()->Error() << "(SceneEffector) ERROR: cannot realize " << "an unknown ActionObject\n"; return false; } boost::shared_ptr<AgentAspect> aspect =GetAgentAspect(); if (aspect.get() == 0) { GetLog()->Error() << "(SceneEffector) ERROR: cannot get AgentAspect\n"; return false; } aspect->ImportScene(sceneAction->GetScene(), shared_ptr<ParameterList>()); return true; } shared_ptr<ActionObject> SceneEffector::GetActionObject(const Predicate& predicate) { if (predicate.name != GetPredicate()) { GetLog()->Error() << "(SceneEffector) ERROR: invalid predicate" << predicate.name << "\n"; return shared_ptr<ActionObject>(); } string scene; if (! predicate.GetValue(predicate.begin(), scene)) { GetLog()->Error() << "ERROR: (SceneEffector) scene filename expected\n"; return shared_ptr<ActionObject>(); }; return shared_ptr<ActionObject>(new SceneAction(GetPredicate(),scene)); } --- NEW FILE: Makefile.am --- pkglib_LTLIBRARIES = sceneeffector.la sceneeffector_la_SOURCES = export.cpp \ sceneeffector.cpp sceneeffector.h \ sceneeffector_c.cpp \ sceneaction.h # -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 sceneeffector_la_LDFLAGS = -module -version-info 0:0:0 AM_CPPFLAGS = -I${top_srcdir}/lib @RUBY_CPPFLAGS@ --- NEW FILE: sceneeffector_c.cpp --- /* -*- mode: c++; c-basic-indent: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2002,2003 Koblenz University Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group $Id: sceneeffector_c.cpp,v 1.1 2005/12/25 14:54:35 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "sceneeffector.h" using namespace boost; using namespace oxygen; void CLASS(SceneEffector)::DefineClass() { DEFINE_BASECLASS(oxygen/Effector); } --- NEW FILE: sceneeffector.h --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2002,2003 Koblenz University Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group $Id: sceneeffector.h,v 1.1 2005/12/25 14:54:35 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef SCENEEFFECTOR_H #define SCENEEFFECTOR_H #include <oxygen/agentaspect/effector.h> class SceneEffector : public oxygen::Effector { // // functions // public: SceneEffector(); virtual ~SceneEffector(); /** realizes the action described by the ActionObject */ virtual bool Realize(boost::shared_ptr<oxygen::ActionObject> action); /** returns the name of the predicate this effector implements. */ virtual std::string GetPredicate() { return "scene"; } /** constructs an Actionobject, describing a predicate */ virtual boost::shared_ptr<oxygen::ActionObject> GetActionObject(const oxygen::Predicate& predicate); }; DECLARE_CLASS(SceneEffector); #endif // SCENEEFFECTOR_H |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:51:22
|
Update of /cvsroot/simspark/simspark/spark/test/coretest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15093/coretest Added Files: .cvsignore Log Message: --- NEW FILE: .cvsignore --- .deps .libs Makefile Makefile.in coretest sys |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:51:22
|
Update of /cvsroot/simspark/simspark/spark/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15093 Added Files: .cvsignore Log Message: --- NEW FILE: .cvsignore --- Makefile Makefile.in |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:42:41
|
Update of /cvsroot/simspark/simspark/spark/test/coretest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13005/coretest Added Files: Makefile.am coretest.rb main.cpp Log Message: - added the minimal coretest --- NEW FILE: main.cpp --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2002,2003 Koblenz University Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group $Id: main.cpp,v 1.1 2005/12/19 20:42:23 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <zeitgeist/zeitgeist.h> #include <oxygen/oxygen.h> #if HAVE_KEROSIN_H #include <kerosin/kerosin.h> #endif using namespace boost; using namespace std; using namespace zeitgeist; int main() { Zeitgeist zg("." PACKAGE_NAME); shared_ptr<CoreContext> context = zg.CreateContext(); #if HAVE_KEROSIN_H kerosin::Kerosin kKerosin(zg); #endif oxygen::Oxygen kOxygen(zg); shared_ptr<ScriptServer> scriptServer = shared_static_cast<ScriptServer>(context->Get("/sys/server/script")); scriptServer->Run("coretest.rb"); cout << "CoreTest - A Small Interactive Text-Based Console Sample" << endl << endl; cout << "Enter 'exit' command to quit application" << endl << endl; bool done = false; while (! done) { std::string command = ""; boost::shared_ptr<Leaf> selectedObject = scriptServer->GetContext()->GetObject(); cout << endl << selectedObject->GetFullPath() << "> "; getline(cin, command,'\n'); if (command.compare("exit")==0) { done = true; } else { scriptServer->Eval(command.c_str()); } } return 0; } --- NEW FILE: Makefile.am --- noinst_PROGRAMS = coretest if BUILD_KEROSIN if DEBUG my_ldadd=${top_srcdir}/kerosin/libkerosin_debug.la else my_ldadd=${top_srcdir}/kerosin/libkerosin.la endif else my_ldadd= endif if DEBUG LDADD = ${my_ldadd} \ ${top_srcdir}/oxygen/liboxygen_debug.la \ ${top_srcdir}/zeitgeist/libzeitgeist_debug.la \ ${top_srcdir}/salt/libsalt_debug.la coretest_CXXFLAGS = -O -g -W -Wall else LDADD = ${my_ldadd} \ ${top_srcdir}/oxygen/liboxygen.la \ ${top_srcdir}/zeitgeist/libzeitgeist.la \ ${top_srcdir}/salt/libsalt.la coretest_CXXFLAGS = -O2 endif AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/utility @FREETYPE_CPPFLAGS@ @RUBY_CPPFLAGS@ coretest_SOURCES = main.cpp --- NEW FILE: coretest.rb --- importBundle "filesystemstd" importBundle "sexpparser" |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:42:36
|
Update of /cvsroot/simspark/simspark/spark/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13005 Added Files: Makefile.am Log Message: - added the minimal coretest --- NEW FILE: Makefile.am --- SUBDIRS = \ corestest |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:35:00
|
Update of /cvsroot/simspark/simspark/spark/test/coretest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11500/coretest Log Message: Directory /cvsroot/simspark/simspark/spark/test/coretest added to the repository |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:16:32
|
Update of /cvsroot/simspark/simspark/spark/plugin/sceneeffector In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7763/sceneeffector Log Message: Directory /cvsroot/simspark/simspark/spark/plugin/sceneeffector added to the repository |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:09:37
|
Update of /cvsroot/simspark/simspark/spark/spark In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5413/spark Added Files: .cvsignore Makefile.am spark.cpp spark.h Log Message: --- NEW FILE: .cvsignore --- .deps .libs Makefile Makefile.in *.la *.lo --- NEW FILE: spark.cpp --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: spark.cpp,v 1.1 2005/12/19 20:09:18 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "spark.h" #include <zeitgeist/zeitgeist.h> #include <kerosin/kerosin.h> #include <oxygen/oxygen.h> #include <kerosin/renderserver/rendercontrol.h> #include <kerosin/inputserver/inputcontrol.h> using namespace spark; using namespace kerosin; using namespace oxygen; using namespace zeitgeist; using namespace salt; using namespace std; using namespace boost; Spark::Spark(const string& relPathPrefix) : mZeitgeist(new Zeitgeist("." PACKAGE_NAME, relPathPrefix)), mOxygen(new Oxygen(*mZeitgeist)), mKerosin(new Kerosin(*mZeitgeist)) { } Spark::~Spark() { // reset shared ptr to objects in the zeitgeist hierarchy before // the zeitgeist core is shutdown mLogServer.reset(); mScriptServer.reset(); mSceneServer.reset(); mSimulationServer.reset(); } bool Spark::Init(int argc, char** argv) { mLogServer = mZeitgeist->GetCore()->GetLogServer(); if (mLogServer.get() == 0) { cout << "(Spark) ERROR: LogServer not found\n"; return false; } mScriptServer = mZeitgeist->GetCore()->GetScriptServer(); if (mScriptServer.get() == 0) { mLogServer->Error() << "(Spark) ERROR: ScriptServer not found\n"; return false; } // run the spark init script mZeitgeist->GetCore()->GetRoot()->GetScript()->RunInitScript ( "spark.rb", "lib/spark", ScriptServer::IS_COMMON ); mSceneServer = shared_dynamic_cast<SceneServer> (mZeitgeist->GetCore()->Get("/sys/server/scene")); if (mSceneServer.get() == 0) { mLogServer->Error() << "(Spark) ERROR: SceneServer not found\n"; return false; } mSimulationServer = shared_dynamic_cast<SimulationServer> (mZeitgeist->GetCore()->Get("/sys/server/simulation")); if (mSimulationServer.get() == 0) { mLogServer->Error() << "(Spark) ERROR: SimulationServer not found\n"; return false; } // run the app defined init return InitApp(argc,argv); } bool Spark::InitApp(int /*argc*/, char** /*argv*/) { return true; } Zeitgeist& Spark::GetZeitgeist() { return (*mZeitgeist); } shared_ptr<Core> Spark::GetCore() { return mZeitgeist->GetCore(); } shared_ptr<zeitgeist::LogServer> Spark::GetLog() { return mZeitgeist->GetCore()->GetLogServer(); } shared_ptr<SceneServer> Spark::GetSceneServer() { return mSceneServer; } shared_ptr<SimulationServer> Spark::GetSimulationServer() { return mSimulationServer; } shared_ptr<InputControl> Spark::GetInputControl() { if (mSimulationServer.get() == 0) { return shared_ptr<InputControl>(); } return shared_dynamic_cast<InputControl> (mSimulationServer->GetControlNode("kerosin/InputControl")); } shared_ptr<RenderControl> Spark::GetRenderControl() { if (mSimulationServer.get() == 0) { return shared_ptr<RenderControl>(); } return shared_dynamic_cast<RenderControl> (mSimulationServer->GetControlNode("kerosin/RenderControl")); } shared_ptr<ScriptServer> Spark::GetScriptServer() { return mScriptServer; } shared_ptr<Scene> Spark::GetActiveScene() { shared_ptr<Scene> scene = mSceneServer->GetActiveScene(); if (scene.get() == 0) { mLogServer->Warning() << "(Spark) Warning: no active scene registered\n"; } return scene; } --- NEW FILE: Makefile.am --- if BUILD_KEROSIN if DEBUG pkglib_LTLIBRARIES = libspark_debug.la libspark_debug_la_SOURCES = $(sources) libspark_debug_la_CXXFLAGS = -O -g -W -Wall libspark_debug_la_LIBADD = @FREETYPE_LIBADD@ -lSDL -lIL -lGL libspark_debug_la_LDFLAGS = -version-info @spark_version_info@ else pkglib_LTLIBRARIES = libspark.la libspark_la_SOURCES = $(sources) libspark_la_CXXFLAGS = -O2 libspark_la_LIBADD = @FREETYPE_LIBADD@ -lSDL -lIL -lGL libspark_la_LDFLAGS = -version-info @spark_version_info@ endif endif AM_CPPFLAGS = -I${top_srcdir}/lib -I${top_srcdir}/utility \ @FREETYPE_CPPFLAGS@ @RUBY_CPPFLAGS@ ## define include directory local to the pkgincludedir libpkgincludedir = $(includedir)/@PACKAGE@/spark ## architecture independent data (scripts) to be installed and ## distributed dist_pkgdata_DATA = spark.rb sources = \ spark.cpp nobase_libpkginclude_HEADERS = \ spark.h --- NEW FILE: spark.h --- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- this file is part of rcssserver3D Fri May 9 2003 Copyright (C) 2003 Koblenz University $Id: spark.h,v 1.1 2005/12/19 20:09:18 rollmark Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef SPARK_SPARK_H #define SPARK_SPARK_H #include <string> #include <boost/shared_ptr.hpp> namespace zeitgeist { class Zeitgeist; class LogServer; class ScriptServer; class Core; } namespace oxygen { class Oxygen; class SceneServer; class SimulationServer; class Scene; } namespace kerosin { class Kerosin; class InputControl; class RenderControl; } namespace spark { /** \class Spark is an application framework for apps that use oxygen and kerosin classes. It provides a default setup of and easy access to all relevant classes. Applications that want to use spark should subclass it and override the given callbacks. */ class Spark { public: Spark(const std::string& relPathPrefix); virtual ~Spark(); /** inits the Spark lib, returns true on success, has to be called once before any other spark methods */ bool Init(int argc, char** argv); // // user callbacks /** called once after Spark finished it's init */ virtual bool InitApp(int argc, char** argv); // // set/get methods /** returns the zeitgeist instance */ zeitgeist::Zeitgeist& GetZeitgeist(); /** returns the zeitgeist core instance */ boost::shared_ptr<zeitgeist::Core> GetCore(); /** returns the LogServer */ boost::shared_ptr<zeitgeist::LogServer> GetLog(); /** returns the ScriptServer */ boost::shared_ptr<zeitgeist::ScriptServer> GetScriptServer(); /** returns the SceneServer */ boost::shared_ptr<oxygen::SceneServer> GetSceneServer(); /** returns the current active Scene */ boost::shared_ptr<oxygen::Scene> GetActiveScene(); /** returns the SimulationServer */ boost::shared_ptr<oxygen::SimulationServer> GetSimulationServer(); /** returns the input control node */ boost::shared_ptr<kerosin::InputControl> GetInputControl(); /** returns the render control node */ boost::shared_ptr<kerosin::RenderControl> GetRenderControl(); protected: boost::shared_ptr<zeitgeist::LogServer> mLogServer; boost::shared_ptr<zeitgeist::ScriptServer> mScriptServer; boost::shared_ptr<oxygen::SceneServer> mSceneServer; boost::shared_ptr<oxygen::SimulationServer> mSimulationServer; boost::shared_ptr<zeitgeist::Zeitgeist> mZeitgeist; boost::shared_ptr<oxygen::Oxygen> mOxygen; boost::shared_ptr<kerosin::Kerosin> mKerosin; }; } // namespace kerosin #endif // SPARK_SPARK_H |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:09:28
|
Update of /cvsroot/simspark/simspark/spark/oxygen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5413/oxygen Added Files: .cvsignore oxygen-config.in oxygen.rb Log Message: --- NEW FILE: .cvsignore --- *.lo .deps .libs Makefile Makefile.in liboxygen*.la oxygen-config --- NEW FILE: oxygen.rb --- # # this is the init script of the Oxygen library # # (empty) --- NEW FILE: oxygen-config.in --- #! /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ usage() { cat <<EOF Usage: oxygen-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--libtool] [--cflags] EOF exit $1 } if test $# -eq 0 ; then usage 1 1>&2 fi while test $# -gt 0 ; do case "$1" in -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; *) optarg= ;; esac case $1 in --prefix=*) prefix=$optarg local_prefix=yes ;; --prefix) echo_prefix=yes ;; --exec-prefix=*) exec_prefix=$optarg exec_prefix_set=yes local_prefix=yes ;; --exec-prefix) echo_exec_prefix=yes ;; --version) echo @oxygen_version@ exit 0 ;; --cflags) echo_cflags=yes ;; --libs) echo_libs=yes ;; --libtool) echo_libtool=yes ;; *) usage 1 1>&2 ;; esac shift done if test "$local_prefix" = "yes" ; then if test "$exec_prefix_set" != "yes" ; then exec_prefix=$prefix fi fi if test "$echo_prefix" = "yes" ; then echo $prefix fi if test "$echo_exec_prefix" = "yes" ; then echo $exec_prefix fi if test "$echo_cflags" = "yes" ; then cflags="-I@includedir@/rcssserver3d" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ else echo $cflags fi fi if test "$echo_libs" = "yes" ; then if test "@debug@" = "true"; then libs="-loxygen_debug" else libs="-loxygen" fi echo -L@libdir@/rcssserver3d $libs fi if test "$echo_libtool" = "yes" ; then if test "@debug@" = "true"; then convlib="liboxygen_debug.la" else convlib="liboxygen.la" fi echo @libdir@/rcssserver3d/$convlib fi # EOF |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:09:27
|
Update of /cvsroot/simspark/simspark/spark/kerosin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5413/kerosin Added Files: kerosin-config.in Log Message: --- NEW FILE: kerosin-config.in --- #! /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ usage() { cat <<EOF Usage: kerosin-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--libtool] [--cflags] EOF exit $1 } if test $# -eq 0 ; then usage 1 1>&2 fi while test $# -gt 0 ; do case "$1" in -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; *) optarg= ;; esac case $1 in --prefix=*) prefix=$optarg local_prefix=yes ;; --prefix) echo_prefix=yes ;; --exec-prefix=*) exec_prefix=$optarg exec_prefix_set=yes local_prefix=yes ;; --exec-prefix) echo_exec_prefix=yes ;; --version) echo @kerosin_version@ exit 0 ;; --cflags) echo_cflags=yes ;; --libs) echo_libs=yes ;; --libtool) echo_libtool=yes ;; *) usage 1 1>&2 ;; esac shift done if test "$local_prefix" = "yes" ; then if test "$exec_prefix_set" != "yes" ; then exec_prefix=$prefix fi fi if test "$echo_prefix" = "yes" ; then echo $prefix fi if test "$echo_exec_prefix" = "yes" ; then echo $exec_prefix fi if test "$echo_cflags" = "yes" ; then cflags="-I@includedir@/rcssserver3d" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ else echo $cflags fi fi if test "$echo_libs" = "yes" ; then if test "@debug@" = "true"; then libs="-lkerosin_debug" else libs="-lkerosin" fi echo -L@libdir@/rcssserver3d $libs fi if test "$echo_libtool" = "yes" ; then if test "@debug@" = "true"; then convlib="libkerosin_debug.la" else convlib="libkerosin.la" fi echo @libdir@/rcssserver3d/$convlib fi # EOF |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:09:26
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5413/zeitgeist Added Files: zeitgeist-config.in zeitgeist.rb Log Message: --- NEW FILE: zeitgeist-config.in --- #! /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ usage() { cat <<EOF Usage: zeitgeist-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--libtool] [--cflags] EOF exit $1 } if test $# -eq 0 ; then usage 1 1>&2 fi while test $# -gt 0 ; do case "$1" in -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; *) optarg= ;; esac case $1 in --prefix=*) prefix=$optarg local_prefix=yes ;; --prefix) echo_prefix=yes ;; --exec-prefix=*) exec_prefix=$optarg exec_prefix_set=yes local_prefix=yes ;; --exec-prefix) echo_exec_prefix=yes ;; --version) echo @zeitgeist_version@ exit 0 ;; --cflags) echo_cflags=yes ;; --libs) echo_libs=yes ;; --libtool) echo_libtool=yes ;; *) usage 1 1>&2 ;; esac shift done if test "$local_prefix" = "yes" ; then if test "$exec_prefix_set" != "yes" ; then exec_prefix=$prefix fi fi if test "$echo_prefix" = "yes" ; then echo $prefix fi if test "$echo_exec_prefix" = "yes" ; then echo $exec_prefix fi if test "$echo_cflags" = "yes" ; then cflags="-I@includedir@/rcssserver3d" if test "@includedir@" != "/usr/include" ; then echo $cflags -I@includedir@ else echo $cflags fi fi if test "$echo_libs" = "yes" ; then if test "@debug@" = "true"; then libs="-lzeitgeist_debug" else libs="-lzeitgeist" fi echo -L@libdir@/rcssserver3d $libs fi if test "$echo_libtool" = "yes" ; then if test "@debug@" = "true"; then convlib="libzeitgeist_debug.la" else convlib="libzeitgeist.la" fi echo @libdir@/rcssserver3d/$convlib fi # EOF --- NEW FILE: zeitgeist.rb --- # # this is the init script of the Zeitgeist library # # here we perform the callback to zeitgeist def method_missing(methId, *args) str = methId.id2name selectCall str, args end # this method allows us to create new instance variables in class objects # we use class objects as 'namespaces' # createVariable can be used in two forms: # - 2 parameters: createVariable("myNamespace.myVarName", "myValue"); # - 3 parameters: createVariable("myNamespace", "myVarName", "myValue"); def createVariable (namespace, variable, value = nil) # 2 parameters means the "namespace.variable", "value" form if (value == nil) value = variable; # parse namespace into a namespace and varName pair periodIndex = namespace.index('.'); if (periodIndex != nil && periodIndex > 0) variable = namespace[(periodIndex+1)..-1]; namespace = namespace[0..(periodIndex-1)]; else namespace = nil; end end # here we have 3 parameters: namespace, variable, and value if (namespace != nil) eval <<-EOS class #{namespace} end class << #{namespace} attr_accessor :#{variable} end #{namespace}.#{variable} = value EOS end end # this is a proxy class for objects created with 'create' via the Zeitgeist # framework. It allows arbitrary methods to be called on the object and allows # for much nicer syntax, than the select-call paradigm class ZeitgeistObject # a pointer to the object represented by t attr_reader :objPointer def method_missing(methId, *args) #print "Missing method", @objPointer, "->", methId.id2name, "\n" str = methId.id2name thisCall @objPointer, str, args end def initialize(objPointer) #print "Creating new ZeitgeistObject ", objPointer, "\n" @objPointer = objPointer end end # set up some useful aliases alias cd selectObject |
|
From: Markus R. <rol...@us...> - 2005-12-19 20:09:26
|
Update of /cvsroot/simspark/simspark/spark/config.aux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5413/config.aux Added Files: .cvsignore cvs.am dist.am msi.am rpm.am sf.am Log Message: --- NEW FILE: sf.am --- $(UPLOAD_BIN) $(UPLOAD_SRC): TYPE=`echo "$@" | $(SED) -e 's/upload-//'`; \ DIST="dist-$${TYPE}"; \ $(MAKE) $(AM_MAKEFLAGS) $${DIST}; \ list='$(UPLOAD_TARGETS)'; \ pattern=`echo "^{$${TYPE}=>"`; \ for dist in $$list; do \ echo $$dist | grep "^{$${TYPE}=>" >& /dev/null; \ if test "$$?" -eq "0"; then \ TARGET=`echo "$$dist" | $(AWK) -v pattern=$$pattern '{ sub( pattern, ""); sub( /}$$/, "" ); print; }'`; \ fi \ done; \ ncftpput -v upload.sourceforge.net /incoming $$TARGET upload-src: $(UPLOAD_SRC) upload-bin: $(UPLOAD_BIN) upload: upload-src upload-bin --- NEW FILE: .cvsignore --- compile config.guess config.sub depcomp install-sh ltmain.sh missing mkinstalldirs --- NEW FILE: rpm.am --- CLEANFILES += \ install_files \ @PACKAGE@-@VERSION@.spec \ *.rpm \ rpmmacros \ RPMChangeLog EXTRA_DIST += \ spec.tmpl \ RPMChangeLog if BUILD_RPM dist-rpm: rpm dist-srpm: srpm EXTRA_BIN_DISTS += rpm EXTRA_SRC_DISTS += srpm UPLOAD_BIN += upload-rpm UPLOAD_SRC += upload-srpm UPLOAD_TARGETS += \ {rpm=>@PACKAGE@-@VERSION@-0.i*.$(PLATFORM_SUFFIX).rpm} \ {srpm=>@PACKAGE@-@VERSION@-0.src.rpm} rpm: @PACKAGE@-@VERSION@-0.i*.$(PLATFORM_SUFFIX).rpm srpm: @PACKAGE@-@VERSION@-0.src.rpm @PACKAGE@-@VERSION@-0.i*.$(PLATFORM_SUFFIX).rpm: rpmmacros install_files @PACKAGE@-@VERSION@.spec @if ! test -d @PACKAGE@-@VERSION@; then \ $(MAKE) $(AM_MAKEFLAGS) dist-gzip; \ tar zxvf @PACKAGE@-@VERSION@.tar.gz; \ fi @cp @PACKAGE@-@VERSION@.spec @PACKAGE@-@VERSION@/. @tar zcvf @PACKAGE@-@VERSION@.tar.gz @PACKAGE@-@VERSION@ @if test -z "$(PLATFORM_SUFFIX)"; then \ echo ""; \ echo "Error: PLATFORM_SUFFIX is not set."; \ echo "You may only build RPMs if you set the PLATFORM_SUFFIX."; \ echo "You should set it to something like su82 for SuSE 8.2 or"; \ echo "rh71 for RedHat 7.1 or mdk9 for Mandrake 9, etc. e.g."; \ echo ""; \ echo "./configure PLATFORM_SUFFIX=su82"; \ echo ""; \ exit 1; \ fi @$(RPM) -tb @PACKAGE@-@VERSION@.tar.gz @RPMDIR=`cat rpmmacros | $(AWK) '/%_rpmdir/ { print $$2; }'`; \ echo "$$RPMDIR" | grep "%{.*}" >& /dev/null; \ EXIT=$$?; \ while test $$EXIT == "0"; do \ RPMDIR=`echo "$$RPMDIR" | $(AWK) '/%{.*}/ \ { match( $$0, /%{.*}/, macro ); \ suffix = substr( $$0, RSTART + RLENGTH ); \ gsub( /{|}/, "", macro[ 0 ] ); \ while( ( getline < "rpmmacros" ) > 0 ) \ { if( $$1 == macro[ 0 ] ) { print $$2 suffix; exit; } } \ exit 1; \ }'`; \ if test $$? == "0"; then \ echo "$$RPMDIR" | grep "%{.*}" >& /dev/null; \ EXIT=$$?; \ else \ EXIT="1"; \ fi; \ done; \ if test -d "$$RPMDIR"; then \ for dir in `ls "$$RPMDIR"`; do \ ls "$${RPMDIR}$${dir}/@PACKAGE@-@VERSION@-0.$${dir}.rpm" >& /dev/null; \ if test $$? == "0"; then \ cp "$${RPMDIR}$${dir}/@PACKAGE@-@VERSION@-0.$${dir}.rpm" @PACKAGE@-@VERSION@-0.$${dir}.$(PLATFORM_SUFFIX).rpm; \ echo ""; \ echo "@PACKAGE@-@VERSION@-0.$${dir}.$(PLATFORM_SUFFIX).rpm has been created."; \ echo "If you are not a maintainer, please consider emailing the"; \ echo "RPM to sse...@li..., so they can make it" ; \ echo "available for others"; \ echo ""; \ found=true; \ fi; \ done; \ if ! $$found; then \ echo "RPM built but not found."; \ echo "Please copy it to this directory manually."; \ exit 1; \ fi; \ else \ echo "RPM built but I cannot find RPM directory."; \ echo "Please copy it to this directory manually."; \ exit 1; \ fi; @rm -f @PACKAGE@-@VERSION@.tar.gz @rm -f @PACKAGE@-@VERSION@/@PACKAGE@-@VERSION@.spec @PACKAGE@-@VERSION@-0.src.rpm: rpmmacros install_files @PACKAGE@-@VERSION@.spec @if ! test -d @PACKAGE@-@VERSION@; then \ $(MAKE) $(AM_MAKEFLAGS) dist-gzip; \ tar zxvf @PACKAGE@-@VERSION@.tar.gz; \ fi @cp @PACKAGE@-@VERSION@.spec @PACKAGE@-@VERSION@/. @tar zcvf @PACKAGE@-@VERSION@.tar.gz @PACKAGE@-@VERSION@ @$(RPM) -ts @PACKAGE@-@VERSION@.tar.gz @SRPMDIR=`cat rpmmacros | $(AWK) '/%_srcrpmdir/ { print $$2; }'`; \ echo "$$SRPMDIR" | grep "%{.*}" >& /dev/null; \ EXIT=$$?; \ while test $$EXIT == "0"; do \ SRPMDIR=`echo "$$SRPMDIR" | $(AWK) '/%{.*}/ \ { match( $$0, /%{.*}/, macro ); \ suffix = substr( $$0, RSTART + RLENGTH ); \ gsub( /{|}/, "", macro[ 0 ] ); \ while( ( getline < "rpmmacros" ) > 0 ) \ { if( $$1 == macro[ 0 ] ) { print $$2 suffix; exit; } } \ exit 1; \ }'`; \ if test $$? == "0"; then \ echo "$$SRPMDIR" | grep "%{.*}" >& /dev/null; \ EXIT=$$?; \ else \ EXIT="1"; \ fi; \ done; \ if test -d "$$SRPMDIR"; then \ ls "$${SRPMDIR}/@PACKAGE@-@VERSION@-0.src.rpm" >& /dev/null; \ if test $$? == "0"; then \ cp "$${SRPMDIR}/@PACKAGE@-@VERSION@-0.src.rpm" .; \ found=true; \ fi; \ if ! $$found; then \ echo "SRPM built but not found."; \ echo "Please copy it to this directory manually."; \ exit 1; \ fi; \ else \ echo "SRPM built but I cannot find SRPM directory."; \ echo "Please copy it to this directory manually."; \ exit 1; \ fi; @rm -f rpm-@PACKAGE@-@VERSION@.tar.gz @rm -f @PACKAGE@-@VERSION@/@PACKAGE@-@VERSION@.spec ~/.rpmmacros: @echo "~/.rpmmacros not found. Creating one like the following."; \ echo ""; \ echo "%packager <YOUR NAME>"; \ echo ""; \ echo "%distribution <YOUR_DISTRIBUTION>"; \ echo "%vendor RCSS"; \ echo ""; \ echo "%_topdir $$HOME"; \ echo "%_tmppath /tmp/"; \ echo ""; \ echo "%_rpmtopdir %{_topdir}rpm/"; \ echo "%_builddir %{_tmppath}"; \ echo "%_rpmdir %{_rpmtopdir}RPMS/"; \ echo "%_sourcedir %{_rpmtopdir}SOURCES/"; \ echo "%_specdir %{_rpmtopdir}SPECS/"; \ echo "%_srcrpmdir %{_rpmtopdir}SRPMS/"; \ echo ""; \ echo "Where <YOUR_NAME> is your name and <YOUR_DISTRIBUTION> is the"; \ echo "distribution you are building on (e.g. SuSE Linux 8.2 or"; \ echo "RedHat Linux 7.1)."; \ exit -1; rpmmacros: ~/.rpmmacros @cp ~/.rpmmacros rpmmacros; endif RPMChangeLog: ChangeLog $(AWK) '/^[^0-9]/ { if( $$1 == "*" ) $$1 = "-"; print; } /^$$/ { print; } /^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { if( stop ) exit; "date -d " $$1 " +\"%a %b %d %Y\"" | getline test; $$1 = test; print "* " $$0; } /Released @PACKAGE@-/ { gsub( /@PACKAGE@-/, "", $$2 ); split( $$2, ver, "." ); split( "@VERSION@", curr_ver, "." ); if( ver[ 1 ] != curr_ver[ 1 ] || ver[ 2 ] != curr_ver[ 2 ] ) stop = 1; } END { print "[Please see the ChangeLog file for older changes] - Ed."; }' @srcdir@/ChangeLog > @srcdir@/RPMChangeLog spec: @PACKAGE@-@VERSION@.spec @PACKAGE@-@VERSION@.spec: spec.tmpl install_files RPMChangeLog @sed -e 's/@NAME@/@PACKAGE@/' -e 's/@VER@/@VERSION@/' \ "@srcdir@/spec.tmpl" \ | $(AWK) -v files="$$files" \ '{ print; } \ /%defattr/ { while((getline < "install_files" ) > 0 ) { print; } }' \ > @PACKAGE@-@VERSION@.spec cat @srcdir@/RPMChangeLog >> @PACKAGE@-@VERSION@.spec --- NEW FILE: dist.am --- install_files: always @$(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(PWD)/staging install; \ cd $(PWD)/staging; \ find . ! -type d -print | \ $(AWK) '/^\.\/usr\/local\/lib/ { \ sub( /\.\/usr\/local\/lib/, "%{_libdir}" ); } \ /^\.\/usr\/local\/bin/ { \ sub( /\.\/usr\/local\/bin/, "%{_bindir}" ); } \ /^\.\/usr\/local\/include/ { \ sub( /\.\/usr\/local\/include/, "%{_includedir}" ); } \ /^\.\/usr\/local\/share/ { \ sub( /\.\/usr\/local\/share/, "%{_datadir}" ); } \ /^\.\/usr\/local/ { \ sub( /\.\/usr\/local/, "%{_prefix}" ); } \ /^\./ { sub( /\./, "" ); } \ /./ { print; }' > $(PWD)/install_files.tmp; \ rm -rf $(PWD)/staging @if test -f "install_files"; then \ diff install_files.tmp install_files >& /dev/null; \ if test $$? -eq 1; then \ mv install_files.tmp install_files; \ else \ rm -f install_files.tmp; \ fi \ else \ mv install_files.tmp install_files; \ fi always: dist-src: dist-all list='$(EXTRA_SRC_DISTS)'; \ for dist in $$list; do \ $(MAKE) $(AM_MAKEFLAGS) dist-$$dist; \ done dist-bin: list='$(EXTRA_BIN_DISTS)'; \ for dist in $$list; do \ $(MAKE) $(AM_MAKEFLAGS) dist-$$dist; \ done dist2 dist-all2: dist-src dist-bin --- NEW FILE: cvs.am --- CLEANFILES += \ *.tmp branch-major: commit @ver=`echo "@VERSION@" | sed s/\\\\.[0-9][0-9]*\\\\.[0-9][0-9]*$$//`; \ tag=`echo "@PACKAGE@-$$ver"`; \ echo ""; \ echo "Creating major brach: $$tag"; \ cvs tag -b "$$tag"; \ echo "Use 'cvs co -r $$tag @PACKAGE@' to access the branch"; \ echo ""; \ $(AWK) -f @srcdir@/config.aux/rel.awk -v change=1 @srcdir@/configure.ac > configure.tmp; \ touch @srcdir@/commitlog if test "$$USERNAME" = ""; then \ USERNAME="$$USER"; fi; \ if test "$$USEREMAIL" = ""; then \ USEREMAIL="sse...@li..."; fi; \ DATE=`date +"%Y-%m-%d"`; \ LOGHEADER=`echo -e "$$DATE\t$$USERNAME\t<$$USEREMAIL>\n"`; \ echo -e "$$LOGHEADER\n\n\t* ./configure.ac\n\tCreated major branch: $$tag\n\tUse 'cvs co -r $$tag @PACKAGE@' to access the branch" \ | cat - @srcdir@/commitlog > commitlog.tmp @mv commitlog.tmp @srcdir@/commitlog @mv configure.tmp @srcdir@/configure.ac @$(MAKE) $(AM_MAKEFLAGS) commit branch-minor: commit @ver=`echo "@VERSION@" | sed s/\\\\.[0-9][0-9]*$$//`; \ tag=`echo "@PACKAGE@-$$ver" | sed s/\\\\./_/g`; \ echo ""; \ echo "Creating minor brach: $$tag"; \ cvs tag -b "$$tag"; \ echo "Use 'cvs co -r $$tag @PACKAGE@' to access the branch"; \ echo ""; \ $(AWK) -f @srcdir@/config.aux/rel.awk -v change=2 @srcdir@/configure.ac > configure.tmp; \ touch @srcdir@/commitlog if test "$$USERNAME" = ""; then \ USERNAME="$$USER"; fi; \ if test "$$USEREMAIL" = ""; then \ USEREMAIL="sse...@li..."; fi; \ DATE=`date +"%Y-%m-%d"`; \ LOGHEADER=`echo -e "$$DATE\t$$USERNAME\t<$$USEREMAIL>\n"`; \ echo -e "$$LOGHEADER\n\n\t* ./configure.ac\n\tCreated minor branch: $$tag\n\tUse 'cvs co -r $$tag @PACKAGE@' to access the branch" \ | cat - @srcdir@/commitlog > commitlog.tmp @mv commitlog.tmp @srcdir@/commitlog @mv configure.tmp @srcdir@/configure.ac @$(MAKE) $(AM_MAKEFLAGS) commit release: update distcheck add_rel commit tag quick-release: update add_rel commit tag tag: do_tag inc_rel do_tag: @tag=`echo @PACKAGE@-@VERSION@ | sed s/\\\\./_/g`; \ echo "tagging release with $$tag"; \ echo `cvs tag $$tag`; \ echo "You can access this release by running:"; \ echo " cvs co -r $$tag -d @PACKAGE@-@VERSION@ @PACKAGE@"; \ echo "The release will then be available in the @PACKAGE@-@VERSION@ directory"; add_rel: touch @srcdir@/commitlog if test "$$USERNAME" = ""; then \ USERNAME="$$USER"; fi; \ if test "$$USEREMAIL" = ""; then \ USEREMAIL="sse...@li..."; fi; \ DATE=`date +"%Y-%m-%d"`; \ LOGHEADER=`echo -e "$$DATE\t$$USERNAME\t<$$USEREMAIL>\n"`; \ echo -e "$$LOGHEADER\n\n\t* ./configure.ac\n\tReleased @PACKAGE@-@VERSION@\n\tYou can access this release by running:\n\t\tcvs co -r $$tag -d @PACKAGE@-@VERSION@ @PACKAGE@\n\tThe release will then be available in the @PACKAGE@-@VERSION@ directory" \ | cat - @srcdir@/commitlog > commitlog.tmp mv commitlog.tmp @srcdir@/commitlog inc_rel: $(AWK) -f @srcdir@/config.aux/rel.awk -v change=3 @srcdir@/configure.ac > configure.tmp; mv configure.tmp @srcdir@/configure.ac $(MAKE) $(AM_MAKEFLAGS) commit update: @cvs -z9 update commit: update commitlog @cat @srcdir@/commitlog @srcdir@/ChangeLog > ChangeLog.tmp @mv ChangeLog.tmp @srcdir@/ChangeLog @cvs -z9 commit -F commitlog @rm -f commitlog commitlog: $(DISTFILES) @if test "$$USERNAME" = ""; then \ USERNAME="$$USER"; \ fi; \ if test "$$USEREMAIL" = ""; then \ USEREMAIL="sse...@li..."; \ fi; \ DATE=`date +"%Y-%m-%d"`; \ cvs -z9 diff -u --brief 2>&1 | $(AWK) \ -v title="/* -*-change-log-*- */\n$$DATE\t$$USERNAME\t<$$USEREMAIL>\n" \ 'BEGIN { print title; } \ /^Index/ { print "\t* ./" $$2 } \ /^cvs server: .* is a new entry/ { print "\t* ./" $$3 } \ END { print ""; }' \ > commitlog.tmp @if test -s commitlog.tmp; then \ if test -f @srcdir@/commitlog; then \ cat @srcdir@/commitlog >> commitlog.tmp; \ fi; \ mv commitlog.tmp @srcdir@/commitlog; \ if test -n "$(CVSEDITOR)"; then $(CVSEDITOR) @srcdir@/commitlog; \ elif test -n "$(VISUAL)"; then $(VISUAL) @srcdir@/commitlog; \ elif test -n "$(EDITOR)"; then $(EDITOR) @srcdir@/commitlog; \ else \ EDITOR=`which vi`; \ if test -n "$$EDITOR" && test -x "$$EDITOR"; then \ $$EDITOR @srcdir@/commitlog; \ else \ echo ""; \ echo "Cannot find an editor."; \ echo "Please edit @srcdir@/commitlog manually\n"; \ exit 1; \ fi; \ fi; \ $(AWK) 'BEGIN { first=1; } /\/\* -\*-change-log-\*- \*\// { $$0 = ""; } // { if( first==1 && $$0 == "" ) { first=0; } else { print; } }' @srcdir@/commitlog > commitlog.tmp; \ mv commitlog.tmp @srcdir@/commitlog; \ fi --- NEW FILE: msi.am --- #MSI_SETUP_FILE must be set to the msi file that is created by VC++ dist-msi: @if test -f "$(MSI_SETUP_FILE)"; then \ cp "$(MSI_SETUP_FILE)" @PACKAGE@-@VERSION@.msi; \ else \ echo "the msi file ($(MSI_SETUP_FILE)) must be (re)created"; \ echo "by building it with VC++7"; \ fi EXTRA_BIN_DISTS += msi UPLOAD_BIN += upload-msi UPLOAD_TARGETS += \ {msi=>@PACKAGE@-@VERSION@.msi} |
