--- realtimebattle-1.0.8.orig/Documentation/RealTimeBattle.info +++ realtimebattle-1.0.8/Documentation/RealTimeBattle.info @@ -3,6 +3,11 @@ \input texinfo +INFO-DIR-SECTION Games +START-INFO-DIR-ENTRY +* RealTimeBattle: (RealTimeBattle). A robot programming game +END-INFO-DIR-ENTRY +  File: RealTimeBattle.info, Node: Top, Next: Introduction, Up: (dir) --- realtimebattle-1.0.8.orig/Robots/Makefile.in +++ realtimebattle-1.0.8/Robots/Makefile.in @@ -246,7 +246,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ uudecode = @uudecode@ -SUBDIRS = empty rotate_and_fire seek_and_destroy xt-bot thomas2 joypad_robot jBot perl-Skeleton perl raziel +SUBDIRS = $(ROBOTS) all: all-recursive .SUFFIXES: --- realtimebattle-1.0.8.orig/Robots/jBot/jBot.robot.in +++ realtimebattle-1.0.8/Robots/jBot/jBot.robot.in @@ -20,4 +20,4 @@ echo RobotOption $SIGNAL 0 echo RobotOption $USE_NON_BLOCKING 1 # program options: 1=SLEEP in [ms], 2=Robot Name -exec @JAVA@ -classpath $CLASSPATH:$RTB_PATH JBotMain $SLEEP $RobotName +exec java -classpath $CLASSPATH:$RTB_PATH JBotMain $SLEEP $RobotName --- realtimebattle-1.0.8.orig/Robots/joypad_robot/joypad_robot.c +++ realtimebattle-1.0.8/Robots/joypad_robot/joypad_robot.c @@ -18,7 +18,7 @@ /* #include */ double GAME_OPT[13]; -double rotate_angle = M_PIl/36; /* 5 deg */ +double rotate_angle = M_PI/36; /* 5 deg */ int joy_fd = -1; @@ -28,7 +28,7 @@ { puts("Name Joybot"); puts("Colour B2DD32 32DDBs"); - + fflush(stdout); } } @@ -51,7 +51,7 @@ void left(void) { printf("RotateAmount 1 %f %f\n",GAME_OPT[ROBOT_MAX_ROTATE],rotate_angle); - + } void shoot(void) @@ -151,7 +151,7 @@ break; default: break; /* do nothing */ - + } break; case JS_EVENT_AXIS: @@ -243,5 +243,5 @@ printf("RobotOption %i 1\n",USE_NON_BLOCKING); fflush(stdout); main_loop(); - + } --- realtimebattle-1.0.8.orig/Robots/perl/perl.robot.in +++ realtimebattle-1.0.8/Robots/perl/perl.robot.in @@ -119,8 +119,8 @@ my %OPTION; my %RDATA = (Energy => 100, RobotsLeft => 0); -open(LOG,">>/tmp/perl.robot.log") || die "Kann Logfile nicht öffnen: $!"; -LOG->autoflush(1); +#open(LOG,">>/tmp/perl.robot.log") || die "Kann Logfile nicht öffnen: $!"; +#LOG->autoflush(1); STDOUT->autoflush(1); STDERR->autoflush(1); @@ -131,13 +131,13 @@ $SIG{USR2} = 'IGNORE'; $SIG{HUP} = \&quit_bot; -print LOG "Starting Roboter\n"; +#print LOG "Starting Roboter\n"; while(not $QUIT) { &run_robot } -print LOG "Jetzt ist aber Ende\a\n"; +#print LOG "Jetzt ist aber Ende\a\n"; exit; ################################################################### @@ -179,7 +179,8 @@ elsif ($cmd eq "Dead") {Dead()} elsif ($cmd eq "GameFinishes") {GameFinishes()} elsif ($cmd eq "ExitRobot") {ExitRobot()} - else {print LOG "Unknown Command $input\n"; + else { +# print LOG "Unknown Command $input\n"; # print "Print Unknown Command $input\n" } } @@ -190,7 +191,7 @@ sub Initialize($) { my $arg = shift; if ($arg ==1) { - print LOG "Initialising\n"; +# print LOG "Initialising\n"; Name($NAME); Colour($COLOR); Print("Ahh, awaken again..."); @@ -228,7 +229,7 @@ # print LOG "Radar: $dist, $obj, $angle\n"; if ($obj == 0) {tac_fire($angle)} if ($obj == 2 or $obj == 4) {tac_wall($dist)} - print LOG "Gotch: $obj\n" if ($obj == 5); +# print LOG "Gotch: $obj\n" if ($obj == 5); } sub Info($$$) { @@ -256,7 +257,7 @@ if ($RDATA{RobotsLeft}) { if ($robots < $RDATA{RobotsLeft}) { Print("Gotcha. Onother one's gone! :-)"); - } + } } $RDATA{RobotsLeft} = $robots; } @@ -265,13 +266,13 @@ my $obj = shift; my $angle= shift; if ($obj == 4) {Print("Boom! Hit by a mine")} - elsif ($obj == 3) {Print("Yamm! Cookies Cookiiiies!")} + elsif ($obj == 3) {Print("Yamm! Cookies Cookiiiies!")} } sub Warning($$) { my $type = shift; my $msg = join(" ",@_); - print LOG "WARN: ($type) $msg\n"; +# print LOG "WARN: ($type) $msg\n"; Print("Someone's fucking me: ($type) $msg"); } @@ -293,13 +294,13 @@ # Tools sub dump_options() { $OPTION{'ROBOT_MAX_ROTATE'}=12; - print LOG "RobotMaxRotate(): ", $OPTION{ROBOT_MAX_ROTATE()},"\n"; - print LOG "RobotMaxRotate: ", $OPTION{ROBOT_MAX_ROTATE},"\n"; - print LOG "RobotCannonMaxRotate: ", $OPTION{ROBOT_CANNON_MAX_ROTATE()},"\n"; - print LOG "RobotMaxAcceleration: ", $OPTION{ROBOT_MAX_ACCELERATION()},"\n"; - print LOG "RobotMinAcceleration: ", $OPTION{ROBOT_MIN_ACCELERATION()},"\n"; - print LOG "RobotStartEnergy: ", $OPTION{ROBOT_START_ENERGY()},"\n"; - +# print LOG "RobotMaxRotate(): ", $OPTION{ROBOT_MAX_ROTATE()},"\n"; +# print LOG "RobotMaxRotate: ", $OPTION{ROBOT_MAX_ROTATE},"\n"; +# print LOG "RobotCannonMaxRotate: ", $OPTION{ROBOT_CANNON_MAX_ROTATE()},"\n"; +# print LOG "RobotMaxAcceleration: ", $OPTION{ROBOT_MAX_ACCELERATION()},"\n"; +# print LOG "RobotMinAcceleration: ", $OPTION{ROBOT_MIN_ACCELERATION()},"\n"; +# print LOG "RobotStartEnergy: ", $OPTION{ROBOT_START_ENERGY()},"\n"; + } ########################################################################## --- realtimebattle-1.0.8.orig/Robots/seek_and_destroy/seek_and_destroy.cc +++ realtimebattle-1.0.8/Robots/seek_and_destroy/seek_and_destroy.cc @@ -20,6 +20,7 @@ #include #include "Messagetypes.h" +#include using namespace std; --- realtimebattle-1.0.8.orig/Robots/thomas2/thomas2.cc +++ realtimebattle-1.0.8/Robots/thomas2/thomas2.cc @@ -25,6 +25,7 @@ #include #include #include +#include #define abs(x) ((x>0) ? (x) : -(x)) #define sgn(x) ((x>0) ? 1 : -1) #define max(a,b) (((a) > (b)) ? (a) : (b)) --- realtimebattle-1.0.8.orig/Robots/xt-bot/xt-bot-a.cpp +++ realtimebattle-1.0.8/Robots/xt-bot/xt-bot-a.cpp @@ -30,6 +30,7 @@ #include #include #include +#include using std::cout; using std::cin; using std::endl; @@ -64,9 +65,9 @@ bot(){ fahr_winkel = 0.0; } void init(); void options(); - void nachricht(); - void debug(char *); - void print(char *); + void nachricht(); + void debug(const char *); + void print(const char *); void beschleunigen(double); void rotateamount(int, double, double); void sweep(int,double,double,double); @@ -86,7 +87,7 @@ cout<<"Accelerate "< #include #include +#include using std::cout; using std::cin; @@ -67,9 +68,9 @@ bot(){ fahr_winkel = 0.0; } void init(); void options(); - void nachricht(); - void debug(char *); - void print(char *); + void nachricht(); + void debug(const char *); + void print(const char *); void beschleunigen(double); void rotateamount(int, double, double); void sweep(int,double,double,double); @@ -89,7 +90,7 @@ cout<<"Accelerate "<. # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +69,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +126,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -158,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -196,55 +200,23 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -297,37 +269,43 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit 0 ;; + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -335,32 +313,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; + exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -369,10 +347,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -384,10 +362,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -398,40 +376,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -455,32 +433,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -496,29 +475,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -526,7 +505,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -541,15 +520,19 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -562,28 +545,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -645,9 +628,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -655,11 +648,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -687,158 +680,192 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit 0 ;; + exit ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit 0 ;; + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -855,8 +882,12 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -874,15 +905,22 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -896,7 +934,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -904,25 +942,31 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -940,15 +984,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -965,7 +1009,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -975,16 +1019,23 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -992,27 +1043,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1020,15 +1071,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; + exit ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,69 +1172,81 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1190,22 +1254,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1216,41 +1283,47 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; esac ;; *:XENIX:*:SysV) echo i386-pc-xenix - exit 0 ;; + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1282,7 +1355,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1371,11 +1444,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1384,22 +1458,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1410,7 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- realtimebattle-1.0.8.orig/config/config.sub +++ realtimebattle-1.0.8/config/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2004-08-29' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +22,15 @@ # # 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., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,8 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -170,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -186,6 +193,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -230,14 +241,16 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -246,6 +259,7 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -254,20 +268,24 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -278,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -297,20 +318,20 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -319,6 +340,7 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -327,27 +349,34 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -418,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -450,8 +487,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -489,6 +526,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -639,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -654,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -679,6 +732,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -754,9 +810,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -778,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -787,6 +850,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -843,6 +912,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -869,6 +942,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -880,6 +957,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -969,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1029,6 +1113,10 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1078,13 +1166,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1157,20 +1242,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1188,7 +1276,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1297,6 +1385,9 @@ -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1319,6 +1410,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1328,9 +1425,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1356,6 +1453,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1374,6 +1474,9 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; @@ -1545,7 +1648,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- realtimebattle-1.0.8.orig/debian/README.Debian +++ realtimebattle-1.0.8/debian/README.Debian @@ -0,0 +1,6 @@ +There are french, Spanich and German html documentation in this +package, but they are not registered in doc-base for now. + +A java virtual machine is only needed to run jBot the java Bot. + + -- Remi Vanicat , Fri Mar 25 09:16:11 2005 --- realtimebattle-1.0.8.orig/debian/changelog +++ realtimebattle-1.0.8/debian/changelog @@ -0,0 +1,338 @@ +realtimebattle (1.0.8-14) unstable; urgency=medium + + [ Markus Koschany ] + * Add realtimebattle.desktop file. + * Install realtimebattle_32x32.xpm to /usr/share/pixmaps. + * Update realtimebattle.menu. Use the new 32x32 pixel icon. + (Closes: #738016) + + [ Logan Rosen ] + * Bug fix: "use autotools-dev to update config.{sub, guess} for new + arches" (Closes: #740653). + + [Rémi Vanicat ] + * Standards-Version: 3.9.5 (no change) + + -- Rémi Vanicat Fri, 28 Mar 2014 19:34:44 +0100 + +realtimebattle (1.0.8-13) unstable; urgency=low + + * Realy include full patch from Cyril Brulebois + + -- Rémi Vanicat Fri, 18 May 2012 14:41:10 +0200 + +realtimebattle (1.0.8-12) unstable; urgency=low + + * Bug fix: "LDFLAGS hardening flags missing", thanks to Simon Ruderich + (Closes: #667956). + + -- Rémi Vanicat Sat, 07 Apr 2012 21:47:18 +0200 + +realtimebattle (1.0.8-11) unstable; urgency=low + + [Cyril Brulebois ] + + * Fix FTBFS with gcc 4.7 by fixing missing includes + (Closes: #667351). + + [ Niels Thykier ] + + * Added build-arch and build-indep to debian/rules. + * Reduce default-jdk-builddep to default-jdk and use default-java. + * Use buildflags.mk from dpkg-dev to set default build flags. + - This enables hardning build by default. + * Patched team-framework/log/sysloglogdriver.cpp, which was using + a non-constant as a format string to syslog. + + [ Rémi Vanicat ] + + * New standards-version: 3.9.3 + * Include path by Niels Thykier (Closes: #648081) + * Add python to build depend for some robots + + -- Rémi Vanicat Sat, 07 Apr 2012 10:48:25 +0200 + +realtimebattle (1.0.8-10) unstable; urgency=low + + * Use default-jdk-builddep and default-jre for jBot (Closes: #548811) + * Use ${misc:Depends} where needed + * Corrected build depend for dephelper + * Deleting postinst and prerm that are not needed anymore + * New Standards-Version: 3.8.3 + + -- Rémi Vanicat Tue, 29 Sep 2009 23:27:26 +0200 + +realtimebattle (1.0.8-9) unstable; urgency=low + + * Use ecj to build jBot (Closes: #529506) + * Going to Standards-Version: 3.8.1.0 + * Make prerm and postinst fail on error + * Another header to explicitly #include in c++ (Closes: #504847) + * Add an section to the info file (Closes: #528885) + + -- Rémi Vanicat Wed, 20 May 2009 04:11:01 +0200 + +realtimebattle (1.0.8-8) unstable; urgency=high + + * Suppression of the logging in the perl robot as it may lead to a + security risk (Closes: #496385). + + -- Rémi Vanicat Tue, 26 Aug 2008 01:00:54 +0200 + +realtimebattle (1.0.8-7) unstable; urgency=low + + * correction of a typo in build-indep dependency (closes: 473931) + + -- Rémi Vanicat Sun, 06 Apr 2008 09:57:58 +0200 + +realtimebattle (1.0.8-6) unstable; urgency=low + + * When building binary-indep package, We need a java virtual machine + (Closes: #471551). + * Use Vcs-* and not XS-Vcs-* in control + + -- Rémi Vanicat Sat, 22 Mar 2008 10:32:12 +0100 + +realtimebattle (1.0.8-5) unstable; urgency=low + + * Don't try to build jBot when not building binary indep package + + -- Rémi Vanicat Mon, 03 Mar 2008 07:50:06 +0100 + +realtimebattle (1.0.8-4) unstable; urgency=low + + * Going to Standards-Version: 3.7.3 + * removing Uploader line + * Adding severall #include for gcc-4.3 (Closes: #455614). + * Removing warning about string constant + * Use M_PI in place of M_PIL (closes: #447700) + * Severall cleanup for lintian + + -- Rémi Vanicat Fri, 29 Feb 2008 14:22:07 +0100 + +realtimebattle (1.0.8-3) unstable; urgency=low + + * I don't use dpatch anymore. + * Make realtimebattle binNMU safe thanks to Lior Kaplan (closes: 432994) + * adding XS-Vcs-Browser and XS-Vcs-git + + -- Rémi Vanicat Wed, 08 Aug 2007 10:52:21 +0200 + +realtimebattle (1.0.8-2) unstable; urgency=low + + * Adding suggest on python for the python bot. + * Really applying patch for gcc 4.1 (closes: #356157, 357403) + * Changing config.guess and config.sub (closes: #342428) + + -- Rémi Vanicat Fri, 17 Mar 2006 16:26:19 +0100 + +realtimebattle (1.0.8-1) unstable; urgency=low + + * New upstream release + * Adding manpage from cvs (closes: #110739) + * Applying patch for gcc 4.1 (closes: #356157) + + -- Rémi Vanicat Fri, 10 Mar 2006 11:29:42 +0100 + +realtimebattle (1.0.7+20050807-1) unstable; urgency=low + + * New upstream release (cvs version) + * Remove circular dependency + * String and List are replaced by stl::string and stl::list + (Closes: #302565). + * Bug fix: "realtimebattle: [INTL:de] German PO file corrections", + thanks to Jens Seidel (Closes: #313822). + * Add Johannes Nicolai to the uploaders field. + * Change the standard version to 3.6.2 + * Make doc-base happy with the name of the Info file + * Override menu-icon-missing as icon is in the common package + + -- Rémi Vanicat Wed, 10 Aug 2005 11:22:18 +0200 + +realtimebattle (1.0.7-5) unstable; urgency=low + + * Move image out of /usr/lib + * Make RTB use the icon + * Correction of the menu entry + * use jikes and not gcj to compile the java files + + -- Rémi Vanicat Wed, 23 Mar 2005 22:27:34 +0100 + +realtimebattle (1.0.7-4) unstable; urgency=low + + * The Team Framework now compile with gcc-3.4 thanks to upstream + (closes: #274270) + * Split java bot and common file into realtimebattle-common + * Make jBot use the java alternative + * Correct the .robot scripts so they look at the correct place for + their needed files + * Move rtb-team out of /usr/share + + -- Rémi Vanicat Thu, 20 Jan 2005 14:46:25 +0100 + +realtimebattle (1.0.7-3) unstable; urgency=low + + * Added buildep on gcj for the java robot + + -- Rémi Vanicat Wed, 22 Dec 2004 15:25:59 +0100 + +realtimebattle (1.0.7-2) unstable; urgency=low + + * solve info installation problem (closes: #86755) + * apply upstream patch for partial gcc-3.4 compilation + (it still fail on Team Framework for now) + + -- Rémi Vanicat Wed, 22 Dec 2004 10:49:01 +0100 + +realtimebattle (1.0.7-1) unstable; urgency=low + + * New upstream release + + -- Rémi Vanicat Fri, 17 Dec 2004 15:32:44 +0100 + +realtimebattle (1.0.6-3) unstable; urgency=low + + * Add AM_MAINTAINER_MODE to configure.in + + -- Rémi Vanicat Fri, 16 Jan 2004 01:32:24 +0100 + +realtimebattle (1.0.6-2) unstable; urgency=low + + * Don't use dh_installinfo, but directly install-info (closes: #225604). + * change name of RealTimeBattle.info.gz to realtimebattle.info.gz. + + -- Rémi Vanicat Sat, 3 Jan 2004 12:11:31 +0100 + +realtimebattle (1.0.6-1) unstable; urgency=low + + * New upstream release + * New Maintener (Rémi Vanicat : + (closes: #221274) + + -- Rémi Vanicat Fri, 5 Dec 2003 13:58:23 +0100 + +realtimebattle (1.0.5-5.1) unstable; urgency=low + + * NMU. + * Build-Depend on gcc-2.95, gcc-2.96, do not build for hppa. + Closes: #134033, #192461. + * Fix doc-base file (closes: #149545). + * Fix download location (closes: #208567). + + -- Matthias Klose Mon, 17 Nov 2003 16:13:56 +0100 + +realtimebattle (1.0.5-5) unstable; urgency=low + + * Fixed bad code that failed with g++3 (closes: #134033) + + -- Fredrik Hallenberg Fri, 15 Feb 2002 18:32:08 +0100 + +realtimebattle (1.0.5-4) unstable; urgency=low + + * Applied patch from John R. Daily to fix + build failure on ia64 (closes: #113628) + + -- Fredrik Hallenberg Thu, 27 Sep 2001 22:08:11 +0200 + +realtimebattle (1.0.5-3) unstable; urgency=low + + * Rebuild to get rid of seg fault (closes: #108387) + * Updated po/Makefile.in.in + * Use section with install-info + + -- Fredrik Hallenberg Sat, 25 Aug 2001 23:19:52 +0200 + +realtimebattle (1.0.5-2) unstable; urgency=low + + * Updated doc-base file (closes: #58204, #74124) + + -- Fredrik Hallenberg Fri, 6 Oct 2000 08:09:35 +0200 + +realtimebattle (1.0.5-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg Sun, 1 Oct 2000 19:30:21 +0200 + +realtimebattle (1.0.3-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg Sun, 27 Feb 2000 20:07:12 +0100 + +realtimebattle (1.0.2-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg Mon, 7 Feb 2000 08:51:37 +0100 + +realtimebattle (1.0.0-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg Fri, 7 Jan 2000 10:58:33 +0100 + +realtimebattle (0.9.11-2) unstable; urgency=low + + * Fixed rotate_and_fire_select.cc so it compiles on glibc2.0 systems. + (closes: #48280) + + -- Fredrik Hallenberg Mon, 25 Oct 1999 17:14:18 +0200 + +realtimebattle (0.9.11-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg Sun, 17 Oct 1999 20:43:53 +0200 + +realtimebattle (0.9.10-1) unstable; urgency=low + + * New upstream release. + * Use doc-base. + + -- Fredrik Hallenberg Sat, 21 Aug 1999 13:11:46 +0200 + +realtimebattle (0.9.9-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg Mon, 16 Aug 1999 14:34:34 +0200 + +realtimebattle (0.9.8-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg Sun, 18 Jul 1999 19:03:26 +0200 + +realtimebattle (0.9.7-2) unstable; urgency=low + + * Recompile with glibc 2.1 (bug #35441) + + -- Fredrik Hallenberg Sat, 3 Apr 1999 14:12:45 +0200 + +realtimebattle (0.9.7-1) unstable; urgency=low + + * Added menuentry from Fredrik Liljegren + * New upstream release + + -- Fredrik Hallenberg Mon, 8 Mar 1999 09:08:25 +0100 + +realtimebattle (0.9.6-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Hallenberg Sat, 20 Feb 1999 13:18:43 +0100 + +realtimebattle (0.9.5-2) unstable; urgency=low + + * Fixed postinst and prerm. + + -- Fredrik Hallenberg Mon, 8 Feb 1999 23:38:08 +0100 + +realtimebattle (0.9.5-1) unstable; urgency=low + + * Initial release. + + -- Fredrik Hallenberg Sat, 6 Feb 1999 18:06:51 +0100 --- realtimebattle-1.0.8.orig/debian/compat +++ realtimebattle-1.0.8/debian/compat @@ -0,0 +1 @@ +5 --- realtimebattle-1.0.8.orig/debian/control +++ realtimebattle-1.0.8/debian/control @@ -0,0 +1,39 @@ +Source: realtimebattle +Section: games +Priority: optional +Maintainer: Rémi Vanicat +Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglib2.0-dev, + dpkg-dev (>= 1.16.1~), python, autotools-dev +Build-Depends-Indep: default-jdk +Vcs-Browser: http://git.debian.org/?p=collab-maint/realtimebattle.git;a=summary +Vcs-Git: git://git.debian.org/git/collab-maint/realtimebattle.git + +Package: realtimebattle +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, realtimebattle-common (=${source:Version}) +Description: Programming game + RealTimeBattle is a programming game in which robots controlled by programs + are fighting each other. The goal is to destroy the enemies, using the + radar to examine the environment and the cannon to shoot. + . + Robot programs can be written in any language, all communication + with the main program is done via stdout/stdin. + . + This package contain the main program, and some Robot. + +Package: realtimebattle-common +Architecture: all +Suggests: default-jre-headless | java-virtual-machine, python +Depends: ${misc:Depends} +Replaces: realtimebattle (<= 1.0.7-3) +Description: Programming game + RealTimeBattle is a programming game in which robots controlled by programs + are fighting each other. The goal is to destroy the enemies, using the + radar to examine the environment and the cannon to shoot. + . + Robot programs can be written in any language, all communication + with the main program is done via stdout/stdin. + . + This package contain some Robot and data that are useful for + realtimebattle --- realtimebattle-1.0.8.orig/debian/copyright +++ realtimebattle-1.0.8/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Fredrik Hallenberg hallon@debian.org on +Sat, 6 Feb 1999 18:06:51 +0100. +Then it was Adopted by Rémi Vanicat on +Fri, 5 Dec 2003 13:58:23 +0100. + +It was downloaded from http://sourceforge.net/project/showfiles.php?group_id=561 + +Copyright: 1998-2000 Erik Ouchterlony and Ragnar Ouchterlony + +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, 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: +Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, +MA 02110-1301, USA. + + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- realtimebattle-1.0.8.orig/debian/realtimebattle-common.dirs +++ realtimebattle-1.0.8/debian/realtimebattle-common.dirs @@ -0,0 +1,10 @@ +usr/share/info +usr/lib/realtimebattle +usr/include/realtimebattle +usr/share/doc/realtimebattle +usr/share/doc/realtimebattle/examples +usr/share/doc/realtimebattle/realtimebattle.html/en +usr/share/doc/realtimebattle/realtimebattle.html/de +usr/share/doc/realtimebattle/realtimebattle.html/fr +usr/share/doc/realtimebattle/realtimebattle.html/es +usr/share/doc/realtimebattle-common/ --- realtimebattle-1.0.8.orig/debian/realtimebattle-common.doc-base +++ realtimebattle-1.0.8/debian/realtimebattle-common.doc-base @@ -0,0 +1,14 @@ +Document: realtimebattle +Title: RealTimeBattle User Manual +Author: Erik Ouchterlony and Ragnar Ouchterlony +Abstract: This manual describes how to play RealTimeBattle. +Section: Games/Board + +Format: HTML +Index: /usr/share/doc/realtimebattle/realtimebattle.html/en/RealTimeBattle.html +Files: /usr/share/doc/realtimebattle/realtimebattle.html/en/RealTimeBattle*.html + +Format: info +Index: /usr/share/info/RealTimeBattle.info.gz +Files: /usr/share/info/RealTimeBattle.info* + --- realtimebattle-1.0.8.orig/debian/realtimebattle-common.docs +++ realtimebattle-1.0.8/debian/realtimebattle-common.docs @@ -0,0 +1,7 @@ +debian/tmp/usr/lib/realtimebattle/Documentation/AUTHORS +debian/tmp/usr/lib/realtimebattle/Documentation/EXTRAROBOTS.README +debian/tmp/usr/lib/realtimebattle/Documentation/NEWS +debian/tmp/usr/lib/realtimebattle/Documentation/README +debian/tmp/usr/lib/realtimebattle/Documentation/TODO + + --- realtimebattle-1.0.8.orig/debian/realtimebattle-common.info +++ realtimebattle-1.0.8/debian/realtimebattle-common.info @@ -0,0 +1 @@ +debian/tmp/usr/info/RealTimeBattle.info --- realtimebattle-1.0.8.orig/debian/realtimebattle-common.install +++ realtimebattle-1.0.8/debian/realtimebattle-common.install @@ -0,0 +1,37 @@ +debian/tmp/usr/share/locale/*/ +debian/tmp/usr/lib/realtimebattle/Documentation/R*.html usr/share/doc/realtimebattle/realtimebattle.html/en +debian/tmp/usr/lib/realtimebattle/Documentation/*.gif usr/share/doc/realtimebattle/realtimebattle.html/en +debian/tmp/usr/lib/realtimebattle/Documentation/*.png usr/share/doc/realtimebattle/realtimebattle.html/en +debian/tmp/usr/lib/realtimebattle/Documentation/French/* usr/share/doc/realtimebattle/realtimebattle.html/fr +debian/tmp/usr/lib/realtimebattle/Documentation/German/* usr/share/doc/realtimebattle/realtimebattle.html/de +debian/tmp/usr/lib/realtimebattle/Documentation/Spanish/* usr/share/doc/realtimebattle/realtimebattle.html/es +debian/tmp/usr/include/RealTimeBattle/* usr/include/realtimebattle/ +debian/tmp/usr/lib/realtimebattle/Robots/empty/ usr/share/doc/realtimebattle/examples +debian/tmp/usr/lib/realtimebattle/Robots/raziel/ usr/share/doc/realtimebattle/examples +debian/tmp/usr/lib/realtimebattle/Robots/joypad_robot/ usr/share/doc/realtimebattle/examples +debian/tmp/usr/lib/realtimebattle/Robots/perl/ usr/share/doc/realtimebattle/examples +debian/tmp/usr/lib/realtimebattle/Robots/perl-Skeleton/ usr/share/doc/realtimebattle/examples +debian/tmp/usr/lib/realtimebattle/Robots/rotate_and_fire/ usr/share/doc/realtimebattle/examples +debian/tmp/usr/lib/realtimebattle/Robots/seek_and_destroy/ usr/share/doc/realtimebattle/examples +debian/tmp/usr/lib/realtimebattle/Robots/thomas2/ usr/share/doc/realtimebattle/examples +debian/tmp/usr/lib/realtimebattle/Robots/xt-bot/ usr/share/doc/realtimebattle/examples +debian/tmp/usr/lib/realtimebattle/Robots/rtb-team-framework/*.conf usr/share/doc/realtimebattle/examples/rtb-team-framework +debian/tmp/usr/lib/realtimebattle/Robots/jBot/*.java usr/share/doc/realtimebattle/examples/jBot/ +debian/tmp/usr/lib/realtimebattle/Robots/jBot/*.in usr/share/doc/realtimebattle/examples/jBot/ +debian/tmp/usr/lib/realtimebattle/Robots/jBot/*.am usr/share/doc/realtimebattle/examples/jBot/ +debian/tmp/usr/lib/realtimebattle/Robots/jBot/*.class usr/lib/realtimebattle/Robots/jBot/ +debian/tmp/usr/lib/realtimebattle/Arenas +debian/tmp/usr/lib/realtimebattle/tournament.txt +debian/tmp/usr/lib/realtimebattle/RealTimeBattle.xpm usr/share/pixmaps +debian/tmp/usr/lib/realtimebattle/Documentation/RealTimeBattle.txt usr/share/doc/realtimebattle/ +debian/tmp/usr/lib/realtimebattle/Documentation/RTB-Team-Framework-Tutorial.tar.gz usr/share/doc/realtimebattle/ +debian/tmp/usr/lib/realtimebattle/Documentation/RealTimeBattle.dvi usr/share/doc/realtimebattle/ +debian/tmp/usr/lib/realtimebattle/Documentation/RealTimeBattle.sgml usr/share/doc/realtimebattle/ +debian/tmp/usr/lib/realtimebattle/Robots/raziel.py*.robot usr/lib/realtimebattle/Robots/ +debian/tmp/usr/lib/realtimebattle/Robots/Columbus-*.robot usr/lib/realtimebattle/Robots/ +debian/tmp/usr/lib/realtimebattle/Robots/empty-*.robot usr/lib/realtimebattle/Robots/ +debian/tmp/usr/lib/realtimebattle/Robots/Cobra-*.robot usr/lib/realtimebattle/Robots/ +debian/tmp/usr/lib/realtimebattle/Robots/Brotfrucht-*.robot usr/lib/realtimebattle/Robots/ +debian/tmp/usr/lib/realtimebattle/Robots/jBot*.robot usr/lib/realtimebattle/Robots/ +debian/tmp/usr/lib/realtimebattle/Robots/perl*.robot usr/lib/realtimebattle/Robots/ +debian/realtimebattle_32x32.xpm usr/share/pixmaps --- realtimebattle-1.0.8.orig/debian/realtimebattle.6 +++ realtimebattle-1.0.8/debian/realtimebattle.6 @@ -0,0 +1,158 @@ +.TH "realtimebattle" 6 "2006-01-25" "1.0.8" "RealTimeBattle" +.SH NAME +RealTimeBattle \- a robot programming game +.SH SYNOPSIS +\f[B]realtimebattle\f[R] +[\f[B]\-n\f[R]|\f[B]\-c\f[R]|\f[B]\-d\f[R]|\f[B]\-D\f[R] \f[I]debug-level\f[R]] +[\f[B]\-g\f[R]] +[\f[B]\-o\f[R] \f[I]option\-file\f[R]] +[\f[B]\-l\f[R] \f[I]logfile\f[R]] +[\f[B]\-t\f[R] \f[I]tournament-file\f[R]] +[\f[B]\-s\f[R] \f[I]statistics-file\f[R]] +[\f[B]\-p\f[R] \f[I]port-number\f[R]] +.br +\f[B]realtimebattle \-\-replay \f[I]logfile\f[R] +[\f[B]\-p\f[R] \f[I]port-number\f[R]] +.br +\f[B]realtimebattle -h \f[R]|\f[B] \-\-help +.br +\f[B]realtimebattle -v \f[R]|\f[B] \-\-version + +.SH DESCRIPTION +\f[B]RealTimeBattle\f[R] is a programming game, in which robots controlled by programs compete against each other. The goal is to destroy the enemies, using the radar to examine the environment and the cannon to shoot. + +Even though the environment the robots are moving in is fairly simple, it is far from easy to construct an intelligent robot\-program. \f[B]RealTimeBattle\f[R] is constructed to be easy to use, flexible and fast. The intention is that the program could be used for learning programming languages, as a test for intelligent algorithms or just as a game to play and enjoy. + +Here is a list of features of \f[B]RealTimeBattle\f[R]: + +.IP \(bu 4 +Game progresses in real time, with the robot programs running as child processes to \f[B]RealTimeBattle\f[R]. +.IP \(bu 4 +The robots communicate with the main program using the standard input and output. +.IP \(bu 4 +Robots can be constructed in almost any programming language. +.IP \(bu 4 +Any number of robots can compete simultaneously if allowed by operating system and hardware. +.IP \(bu 4 +A simple messaging language is used for communication, which makes it easy to start constructing robots. +.IP \(bu 4 +Robots behave like a real physical object. +.IP \(bu 4 +Own arenas can be created. +.IP \(bu 4 +The simulation environment is highly configurable. +.IP \(bu 4 +It is possible to connect external clients to the simulation server. +.IP \(bu 4 +Basic team support is directly integrated in the game, sophisticated team play available due to team frameworks. +.IP \(bu 4 +\f[B]RealTimeBattle\f[R] is distributed under the General Public License (GPL). + + +.SH OPTIONS + +.TP +\fB\-\-debug_mode, \-d +debug mode + +.TP +\fB\-\-debug_level \fI0-5\fB, \-D \fI0-5\fB +sets the initial debug level. implies \-d + +.TP +\fB\-\-normal_mode, \-n +normal mode (default) + +.TP +\fB\-\-competition_mode, \-c +competition mode + +.TP +\fB\-\-no_graphics, \-g +no graphics will be displayed + +.TP +\fB\-\-option_file \fIfile\fB, \-o \fIfile\fB +selects option\-file (default: $HOME/.rtbrc) + +.TP +\fB\-\-log_file \fIfile\fB, \-l \fIfile\fB +make log file, if 'file' is '\-' +the log is sent to STDOUT + +.TP +\fB\-\-tournament_file \fIfile\fB, \-t \fIfile\fB +specify a tournament file to autostart a tournament + +.TP +\fB\-\-statistics_file \fIfile\fB, \-s \fIfile\fB +file to print the statistics to when autostarting + +.TP +\fB\-\-message_file \fIfile\fB, \-m \fIfile\fB +redirect messages to 'file'. + '\-' as 'file' is equivalent to STDOUT. +If both log and messages are send +to STDOUT, '\-m' will be ignored + +.TP +\fB\-\-replay \fIfile\fB, \-r \fIfile\fB +a log file to replay. +if '\-' is specified as file, +input is taken from STDIN + +.TP +\fB\-\-help, \-h +prints this message + +.TP +\fB\-\-version, \-v +prints the version number + +.TP +\fB\-\-port_number, \-p +specifies the port for remote clients (default is 32134) (only available if compiled with --enable-network) + + +.SH EXAMPLES + +.TP +\fBrealtimebattle +Just start \f[B]RealTimeBattle\f[R] in normal mode with graphical user interface and listening for remote clients on port 32134 (if compiled with --enable-network). + +.TP +\fBrealtimebattle \-D \fI5\fB +Enable full debugging output. Note that this is also useful for debugging robots, because the debug level is sent to the robots as a game option. + +.TP +\fBrealtimebattle \-c \-g \-o \f[I]option\-file\f[B] -t \f[I]tournament\-file\f[B] -l \f[I]logfile\f[B] -s \f[I]statistics\-file\f[B] +A typical competition start of \f[B]RealTimeBattle\f[R]. There will be no graphical user interface and the results of the competion will be written to \f[I]logfile\f[R] and \f[I]statistics\-file\f[R]. + + +.SH FILES +\f[I]/usr/share/doc/realtimebattle +.br +/usr/lib/realtimebattle/Arenas +.br +/usr/lib/realtimebattle/Robots +.br +/usr/include/realtimebattle/Messagetypes.h + + +.SH SEE ALSO +The full documentation for \f[B]RealTimeBattle\f[R] is maintained as an SGML manual and should have been installed together with the program in various formats. +You may have a look at the project website, which also contains the documentation: +\f[I]http://realtimebattle.sourceforge.net/ + + +.SH MAINTAINER +The current maintainer of the \f[B]RealTimeBattle\f[R] project is Johannes Nicolai . +Feel free to contact him and the other developers at the source forge project page: \f[I]http://sourceforge.net/projects/realtimebattle/ + + +.SH BUGS +If you find anything in this package which doesn't work, appears strange, is missing, is spellt wrong or is just confusing, +don't hesitate to send in a bug report to the Sourceforge Bug Tracker at: \f[I]http://sourceforge.net/tracker/?group_id=561 + +.SH AUTHOR +This manual page was written by Falko Menge and is part of \f[B]RealTimeBattle\f[R]. --- realtimebattle-1.0.8.orig/debian/realtimebattle.desktop +++ realtimebattle-1.0.8/debian/realtimebattle.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=RealTimeBattle +Comment=programming game +Comment[de]=ein Programmierspiel +Exec=realtimebattle +Icon=realtimebattle +Terminal=false +Type=Application +Categories=Game;StrategyGame; +Keywords=robots;programming;battle;real-time;education; --- realtimebattle-1.0.8.orig/debian/realtimebattle.dirs +++ realtimebattle-1.0.8/debian/realtimebattle.dirs @@ -0,0 +1,4 @@ +usr/games +usr/lib/realtimebattle +usr/share/doc/realtimebattle +usr/share/lintian/overrides --- realtimebattle-1.0.8.orig/debian/realtimebattle.docs +++ realtimebattle-1.0.8/debian/realtimebattle.docs @@ -0,0 +1,7 @@ +debian/tmp/usr/lib/realtimebattle/Documentation/AUTHORS +debian/tmp/usr/lib/realtimebattle/Documentation/EXTRAROBOTS.README +debian/tmp/usr/lib/realtimebattle/Documentation/NEWS +debian/tmp/usr/lib/realtimebattle/Documentation/README +debian/tmp/usr/lib/realtimebattle/Documentation/TODO + + --- realtimebattle-1.0.8.orig/debian/realtimebattle.install +++ realtimebattle-1.0.8/debian/realtimebattle.install @@ -0,0 +1,9 @@ +debian/tmp/usr/bin/* usr/games +debian/tmp/usr/lib/realtimebattle/Robots/rtb-team-framework/rtb-team usr/lib/realtimebattle/Robots/rtb-team-framework/ +debian/tmp/usr/lib/realtimebattle/Robots/empty.robot +debian/tmp/usr/lib/realtimebattle/Robots/joypad_robot.robot +debian/tmp/usr/lib/realtimebattle/Robots/rotate*.robot +debian/tmp/usr/lib/realtimebattle/Robots/seek_and_destroy.robot +debian/tmp/usr/lib/realtimebattle/Robots/thomas2.robot +debian/tmp/usr/lib/realtimebattle/Robots/xt-bot*.robot +debian/realtimebattle.desktop usr/share/applications --- realtimebattle-1.0.8.orig/debian/realtimebattle.menu +++ realtimebattle-1.0.8/debian/realtimebattle.menu @@ -0,0 +1,11 @@ +?package(realtimebattle):\ + needs="X11"\ + section="Games/Simulation"\ + command="/usr/games/realtimebattle"\ + title="RealTimeBattle"\ + icon="/usr/share/pixmaps/realtimebattle_32x32.xpm"\ + longtitle="RealTimeBattle: Robot programming game"\ + description="RealTimeBattle is a programming game in which robots\ + controlled by programs are fighting each other. The goal is to\ + destroy the enemies, using the radar to examine the environment\ + and the cannon to shoot." --- realtimebattle-1.0.8.orig/debian/realtimebattle.override +++ realtimebattle-1.0.8/debian/realtimebattle.override @@ -0,0 +1 @@ +realtimebattle binary: menu-icon-missing /usr/share/pixmaps/realtimebattle.xpm --- realtimebattle-1.0.8.orig/debian/realtimebattle_32x32.xpm +++ realtimebattle-1.0.8/debian/realtimebattle_32x32.xpm @@ -0,0 +1,100 @@ +/* XPM */ +static char *realtimebattle_32x32[] = { +/* columns rows colors chars-per-pixel */ +"29 32 62 1 ", +" c #000000040001", +". c #0000071B0189", +"X c #00000BF20294", +"o c #00000E4D0317", +"O c #0000114703BB", +"+ c #00001553049B", +"@ c #0000240207C7", +"# c #00002ACF093F", +"$ c #00002F5C0A3B", +"% c #000033D20B31", +"& c #0000388C0C3E", +"* c #000041DF0E3A", +"= c #000044070EB1", +"- c #000047010F56", +"; c #00004D3210AC", +": c #000050EF117B", +"> c #000053C11217", +", c #0000573612D6", +"< c #00005838130E", +"1 c #00005C2B13E8", +"2 c #000060D214EA", +"3 c #000063441571", +"4 c #0000733118E2", +"5 c #00007E631B4C", +"6 c #0000851B1CC0", +"7 c #000088BF1D89", +"8 c #000089B81DBF", +"9 c #000090D31F48", +"0 c #000091151F56", +"q c #000097FB20D4", +"w c #00009E602236", +"e c #0000A17022DF", +"r c #0000A8A0246C", +"t c #0000AEA925BA", +"y c #0000B0882621", +"u c #0000BD6728E9", +"i c #0000C4F22A8A", +"p c #0000CE752C98", +"a c #0000CF292CBF", +"s c #0000D5342E0D", +"d c #0000D9542EF1", +"f c #0000DC222F8C", +"g c #0000DC7E2FA0", +"h c #0000DFB83053", +"j c #0000E3FE313F", +"k c #0000E49C3161", +"l c #0000E966326D", +"z c #0000EC50330B", +"x c #0000ECE1332A", +"c c #0000F2783460", +"v c #0000F4E634E6", +"b c #0000F595350C", +"n c #0000F6DA3552", +"m c #0000F85E35B4", +"M c #0000FAFD3637", +"N c #0000FBC93663", +"B c #0000FCC8369A", +"V c #0000FD3636BE", +"C c #0000FDA136C8", +"Z c #0000FF5D3729", +"A c #0000FFDE375F", +"S c None", +/* pixels */ +" SSSSSSSSSSSSSSSSSSSSSSSSSS", +" SSSSSSSSSSSSSSSSSSSSSSSSSS", +" SSSSSSSSSSSSSSSSSSSSSSSSSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSS", +"SSSSSSSS SSSSSSSSSSSSSSSSSSS", +"SSSSSSSS SSSSSSSSSSSSSSSSSSS", +"SSSSSSSS SSSSSSSSSSSSSSSSSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSS", +"SSSSSSSSSSSSSS SSSSSSSSSSSSS", +"SSSSSSSSSSSSSS SSSSSSSSSSSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSS", +"SSSSSSSSSSSSSSSSSMBMMMMMSSSSS", +"SSSSSSSSSSSSSSSSBjwMMMMMMMSSS", +"SSSSSSSSSSSSSSMBk-$fBMMMMMMSS", +"SSSSSSSSSSSSSSMb: 9BbxMMMMMS", +"SSSSSSSSSSSSSMMb2 @ls&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install clean1 --- realtimebattle-1.0.8.orig/include/Dialog.h +++ realtimebattle-1.0.8/include/Dialog.h @@ -27,6 +27,7 @@ #ifndef NO_GRAPHICS #include +#include using namespace std; struct _GtkWidget; @@ -52,7 +53,7 @@ Dialog ( const string& info, const list& button_labels, const DialogFunction func, - const gchar* window_title = "RealTimeBattle" ); + const gchar* window_title = (gchar *)"RealTimeBattle" ); ~Dialog () {} static void generate_result ( GtkWidget* widget, result_t* result_p ); --- realtimebattle-1.0.8.orig/include/Messagetypes.h +++ realtimebattle-1.0.8/include/Messagetypes.h @@ -150,7 +150,7 @@ struct Message { - char* msg; + const char* msg; int number_of_args; enum argument_type arg_type[4]; }; --- realtimebattle-1.0.8.orig/include/Vector2D.h +++ realtimebattle-1.0.8/include/Vector2D.h @@ -24,6 +24,9 @@ using namespace std; +class Vector2D; +Vector2D angle2vec(const double); + class Vector2D { public: --- realtimebattle-1.0.8.orig/src/ControlWindow.cc +++ realtimebattle-1.0.8/src/ControlWindow.cc @@ -62,6 +62,17 @@ gtk_signal_connect( GTK_OBJECT( window_p ), "delete_event", (GtkSignalFunc) ControlWindow::delete_event_occured, (gpointer) this ); + + // The window use an icon + + { + GdkPixbuf *icon = gdk_pixbuf_new_from_file ("/usr/share/pixmaps/realtimebattle.xpm", NULL); + if (icon != NULL) + { + gtk_window_set_default_icon(icon); + gdk_pixbuf_unref(icon); + } + } // Main boxes @@ -285,7 +296,7 @@ gtk_box_pack_start( GTK_BOX( hbox ), time_control, TRUE, TRUE, 0 ); gtk_widget_show( time_control ); - char* rew_xpm[13] = + const char* rew_xpm[13] = { "18 10 2 1", " c None", "x c #000000000000", @@ -299,7 +310,7 @@ " xxxxxx xxxxxx", " xxxx xxxx", " xx xx" }; - char* ffw_xpm[13] = + const char* ffw_xpm[13] = { "18 10 2 1", " c None", "x c #000000000000", @@ -316,7 +327,7 @@ struct button_t { - char** xpm; + const char** xpm; string label; GtkSignalFunc clicked_func; GtkSignalFunc pressed_func; @@ -378,7 +389,7 @@ pixmap = gdk_pixmap_create_from_xpm_d( window_p->window, &bitmap_mask, &(window_p->style->black), - replay_buttons[i].xpm ); + (gchar**)replay_buttons[i].xpm ); GtkWidget* pixmap_widget = gtk_pixmap_new( pixmap, bitmap_mask ); gtk_widget_show( pixmap_widget ); gtk_container_add( GTK_CONTAINER( button_w ), pixmap_widget ); --- realtimebattle-1.0.8.orig/src/ScoreWindow.cc +++ realtimebattle-1.0.8/src/ScoreWindow.cc @@ -69,9 +69,9 @@ gtk_container_add( GTK_CONTAINER( window_p ), scrolled_win ); gtk_widget_show ( scrolled_win ); - char * titles[6] = { "", _("Name"), _("Energy"), _("Place"), - _("Last"), _("Score") }; - clist = gtk_clist_new_with_titles( 6, titles ); + const char * titles[6] = { "", _("Name"), _("Energy"), _("Place"), + _("Last"), _("Score") }; + clist = gtk_clist_new_with_titles( 6, (gchar**) titles ); gtk_clist_set_selection_mode( GTK_CLIST( clist ), GTK_SELECTION_BROWSE ); gtk_clist_set_column_width( GTK_CLIST( clist ), 0, 5 ); gtk_clist_set_column_width( GTK_CLIST( clist ), 1, 120 ); @@ -261,8 +261,8 @@ { robot_p = (Robot*)(*li); - char* empty_list[] = { "", "", "", "", "", "" }; - int row = gtk_clist_append( GTK_CLIST( clist ), empty_list ); + const char* empty_list[] = { "", "", "", "", "", "" }; + int row = gtk_clist_append( GTK_CLIST( clist ), (gchar **)empty_list ); gtk_clist_set_foreground( GTK_CLIST( clist ), row, the_gui.get_fg_gdk_colour_p() ); --- realtimebattle-1.0.8.orig/src/StartTournamentWindow.cc +++ realtimebattle-1.0.8/src/StartTournamentWindow.cc @@ -150,9 +150,9 @@ add_clist( tour_clist, hbox ); - char* button_labels[] = { _(" Remove "), _(" Select All "), - _(" Unselect All "), _(" Add "), - _(" Select All "), _(" Unselect All ") }; + const char* button_labels[] = { _(" Remove "), _(" Select All "), + _(" Unselect All "), _(" Add "), + _(" Select All "), _(" Unselect All ") }; GtkWidget* vbox2 = NULL; @@ -635,10 +635,10 @@ { start_tournament_info_t* info = *li; - char* lst[] = { "" }; + const char* lst[] = { "" }; - int row = gtk_clist_append( GTK_CLIST( tour_clist ), lst ); - gtk_clist_set_foreground( GTK_CLIST( tour_clist ), row, + int row = gtk_clist_append( GTK_CLIST( tour_clist ), (gchar **)lst ); + gtk_clist_set_foreground( GTK_CLIST( tour_clist ), row, the_gui.get_fg_gdk_colour_p()); gtk_clist_set_background( GTK_CLIST( tour_clist ), row, the_gui.get_bg_gdk_colour_p()); @@ -995,9 +995,9 @@ start_tournament_info_t* info_dir_p = *li; if( info_dir_p->selected ) { - char * list[] = { "" }; - - int row = gtk_clist_append( GTK_CLIST( clist_tourn ), list ); + const char * list[] = { "" }; + + int row = gtk_clist_append( GTK_CLIST( clist_tourn ), (gchar **)list ); gtk_clist_set_foreground( GTK_CLIST( clist_tourn ), row, the_gui.get_fg_gdk_colour_p() ); gtk_clist_set_background( GTK_CLIST( clist_tourn ), row, --- realtimebattle-1.0.8.orig/src/StatisticsWindow.cc +++ realtimebattle-1.0.8/src/StatisticsWindow.cc @@ -111,7 +111,7 @@ gtk_widget_show( hbox ); { - char* first_xpm[13] = + const char* first_xpm[13] = { "13 10 2 1", " c None", "x c #000000000000", @@ -125,7 +125,7 @@ "xx xxxxxx", "xx xxxx", "xx xx" }; - char* prev_xpm[13] = + const char* prev_xpm[13] = { "9 10 2 1", " c None", "x c #000000000000", @@ -139,7 +139,7 @@ " xxxxxx", " xxxx", " xx" }; - char* next_xpm[13] = + const char* next_xpm[13] = { "9 10 2 1", " c None", "x c #000000000000", @@ -153,7 +153,7 @@ "xxxxxx ", "xxxx ", "xx " }; - char* last_xpm[13] = + const char* last_xpm[13] = { "13 10 2 1", " c None", "x c #000000000000", @@ -169,7 +169,7 @@ "xx xx" }; struct button_t - { char** xpm; GtkSignalFunc func; gpointer data; int pack; }; + { const char** xpm; GtkSignalFunc func; gpointer data; int pack; }; struct button_t buttons[] = { { first_xpm, (GtkSignalFunc) StatisticsWindow::change_stats_viewed, @@ -194,7 +194,7 @@ pixmap = gdk_pixmap_create_from_xpm_d( window_p->window, &bitmap_mask, &(window_p->style->black), - buttons[i].xpm ); + (gchar **)buttons[i].xpm ); GtkWidget* pixmap_widget = gtk_pixmap_new( pixmap, bitmap_mask ); gtk_widget_show( pixmap_widget ); gtk_container_add( GTK_CONTAINER( button_w ), pixmap_widget ); @@ -222,9 +222,9 @@ gtk_box_pack_start( GTK_BOX( vbox ), scrolled_win, TRUE, TRUE, 0); gtk_widget_show( scrolled_win ); - char * titles[7] = { "",_("Name"), _("Position"), _("Points"), - _("Games"), _("Survival Time"), _("Total Points") }; - clist = gtk_clist_new_with_titles(7, titles ); + const char * titles[7] = { "",_("Name"), _("Position"), _("Points"), + _("Games"), _("Survival Time"), _("Total Points") }; + clist = gtk_clist_new_with_titles(7, (gchar **)titles ); gtk_clist_set_selection_mode( GTK_CLIST( clist ), GTK_SELECTION_BROWSE ); gtk_clist_set_column_width( GTK_CLIST( clist ), 0, 5 ); gtk_clist_set_column_width( GTK_CLIST( clist ), 1, 120 ); @@ -543,8 +543,8 @@ StatisticsWindow::add_new_row( Robot* robot_p, stat_t average_stat, int games_played ) { - char* empty_list[] = { "", "", "", "", "", "", "", "" }; - int row = gtk_clist_append( GTK_CLIST( clist ), empty_list ); + const char* empty_list[] = { "", "", "", "", "", "", "", "" }; + int row = gtk_clist_append( GTK_CLIST( clist ), (gchar **)empty_list ); gtk_clist_set_foreground( GTK_CLIST( clist ), row, the_gui.get_fg_gdk_colour_p() ); gtk_clist_set_background( GTK_CLIST( clist ), row, --- realtimebattle-1.0.8.orig/src/Various.cc +++ realtimebattle-1.0.8/src/Various.cc @@ -54,6 +54,7 @@ #include #include #include +#include using namespace std; #include "Various.h" --- realtimebattle-1.0.8.orig/team-framework/bots/cobra/cobra_clientspecificrepository.h +++ realtimebattle-1.0.8/team-framework/bots/cobra/cobra_clientspecificrepository.h @@ -31,6 +31,7 @@ #include "../../strategies/clientspecificrepository.h" #include "../../exceptions/strategyexception.h" +#include namespace cobra { --- realtimebattle-1.0.8.orig/team-framework/createrobot.sh +++ realtimebattle-1.0.8/team-framework/createrobot.sh @@ -32,7 +32,7 @@ #! /bin/sh #mkdir -p /tmp/@TEAM@/ #rm -f "/tmp/@TEAM@/@STRATEGY@-@ROBOTNAME@-@TEAM@.log" -exec "@RTBHOME@/rtb-team" "@RTBHOME@/@STRATEGY@-@ROBOTNAME@-@TEAM@.conf" +exec "@RTBHOME@/rtb-team" "/usr/share/doc/realtimebattle/examples/rtb-team-framework/@STRATEGY@-@ROBOTNAME@-@TEAM@.conf" #"@RTBHOME@/rtb-team" "@RTBHOME@/@STRATEGY@-@ROBOTNAME@-@TEAM@.conf" __EOF else --- realtimebattle-1.0.8.orig/team-framework/io/unixclientcommunicator.cpp +++ realtimebattle-1.0.8/team-framework/io/unixclientcommunicator.cpp @@ -46,6 +46,7 @@ #include #include #include +#include /** * Namespace --- realtimebattle-1.0.8.orig/team-framework/io/unixinstreambuf.cpp +++ realtimebattle-1.0.8/team-framework/io/unixinstreambuf.cpp @@ -33,7 +33,8 @@ #include "../exceptions/confignotloadedexception.h" #include #include - +#include +#include /** * Namespace */ --- realtimebattle-1.0.8.orig/team-framework/io/unixoutstreambuf.cpp +++ realtimebattle-1.0.8/team-framework/io/unixoutstreambuf.cpp @@ -1,6 +1,6 @@ /************************************************************************ $Id: unixoutstreambuf.cpp,v 1.3 2005/01/06 17:59:28 jonico Exp $ - + RTB - Team Framework: Framework for RealTime Battle robots to communicate efficiently in a team Copyright (C) 2004 The RTB- Team Framework Group: http://rtb-team.sourceforge.net @@ -30,20 +30,23 @@ #include "unixoutstreambuf.h" #include #include +#include +#include +#include /** * Namespace */ namespace IO { - + using std::ostringstream; - - /** + + /** * Constructor */ UnixOutStreambuf::UnixOutStreambuf(int fd) throw() : _fd(fd) { } - /** + /** * Methods */ /** @@ -52,10 +55,10 @@ int UnixOutStreambuf::overflow (int character) throw (IOException, bad_exception) { if( character != EOF ) { char data = character; - + //writing successful? if( write(_fd, &data, 1) != 1 ) { - + //throw exception ostringstream int2string; int2string << _fd; @@ -65,16 +68,16 @@ return character; } /** - * + * */ streamsize UnixOutStreambuf::xsputn (const char* databuffer, streamsize size) throw(IOException, bad_exception) { int num = write(_fd, databuffer, size); - + //writing successful? if( num >= 0 ) return num; else { - + //throw exception ostringstream int2string; int2string << _fd; --- realtimebattle-1.0.8.orig/team-framework/io/unixremoteclientconnection.cpp +++ realtimebattle-1.0.8/team-framework/io/unixremoteclientconnection.cpp @@ -36,6 +36,7 @@ #include #include #include +#include /** * Namespace --- realtimebattle-1.0.8.orig/team-framework/io/unixrtbconnection.cpp +++ realtimebattle-1.0.8/team-framework/io/unixrtbconnection.cpp @@ -33,6 +33,7 @@ #include #include #include +#include /** * Namespace --- realtimebattle-1.0.8.orig/team-framework/io/unixservercommunicator.cpp +++ realtimebattle-1.0.8/team-framework/io/unixservercommunicator.cpp @@ -50,6 +50,7 @@ #include #include #include +#include /** * Namespace --- realtimebattle-1.0.8.orig/team-framework/io/unixserverconnection.cpp +++ realtimebattle-1.0.8/team-framework/io/unixserverconnection.cpp @@ -41,6 +41,8 @@ //IPC #include +#include + /** * Namespace */ --- realtimebattle-1.0.8.orig/team-framework/log/sysloglogdriver.cpp +++ realtimebattle-1.0.8/team-framework/log/sysloglogdriver.cpp @@ -198,7 +198,7 @@ } } - syslog(_syslogPriority, message.c_str()); + syslog(_syslogPriority, "%s", message.c_str()); } map SyslogLogDriver::parseParameterString(const string& parameters) throw --- realtimebattle-1.0.8.orig/team-framework/parser/configurationparser.h +++ realtimebattle-1.0.8/team-framework/parser/configurationparser.h @@ -51,7 +51,7 @@ * Public stuff */ public: - ConfigurationParser::ConfigurationParser() throw (bad_exception); + ConfigurationParser() throw (bad_exception); void addFile(const string& filename) throw(ParserException, bad_exception); const map >& getConfigurationData() const throw(); /*