Menu
▾
▴
armagetronad-commits
|
From: <z-...@us...> - 2011-09-02 09:20:30
|
Revision: 9874
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9874&view=rev
Author: z-man
Date: 2011-09-02 09:20:23 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9869 to 9873:
------------------------------------------------------------------------
r9873 | bazaaarmagetron | 2011-09-02 11:08:25 +0200 (Fri, 02 Sep 2011) | 2 lines
Manuel Moos: But redo zeroinstall streams if files in Upload changed.
------------------------------------------------------------------------
r9872 | bazaaarmagetron | 2011-09-02 11:07:59 +0200 (Fri, 02 Sep 2011) | 2 lines
Manuel Moos: Quieter configure.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9869&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9873&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9872&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/WorkMakefile
armagetronad/trunk/build/configure
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9869
/armagetronad/branches/0.2.8.3:9309-9740
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9873
/armagetronad/branches/0.2.8.3:9309-9740
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-02 09:08:25 UTC (rev 9873)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-02 09:20:23 UTC (rev 9874)
@@ -576,7 +576,7 @@
ZEROINSTTAG=$(RCDIR)/.$(BINARY_TARBALL_NAME).0installtag
zeroinstall: uploadcheck $(ZEROINSTTAG)
-$(ZEROINSTTAG): $(BINARY_TARBALL) 0install/update 0install/*.xml
+$(ZEROINSTTAG): $(BINARY_TARBALL) 0install/update 0install/*.xml $(UPLOAD)/*
#
# *****************************************
# * update zeroinstall stream
Modified: armagetronad/trunk/build/configure
===================================================================
--- armagetronad/trunk/build/configure 2011-09-02 09:08:25 UTC (rev 9873)
+++ armagetronad/trunk/build/configure 2011-09-02 09:20:23 UTC (rev 9874)
@@ -15,7 +15,7 @@
PACKAGER=""
if test -r make.conf.bak; then
PACKAGER=`cat make.conf.bak | grep ^PACKAGER | sed -e 's,^PACKAGER=",,' -e's,"$,,'`
- if grep "AUTOMATICALLY DETERMINED VALUES FOLLOW" make.conf.bak; then
+ if grep "AUTOMATICALLY DETERMINED VALUES FOLLOW" make.conf.bak > /dev/null 2>&1; then
grep -B 10000 -A 2 "AUTOMATICALLY DETERMINED VALUES FOLLOW" make.conf.bak > make.conf
else
cp make.conf.template make.conf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-04 14:13:21
|
Revision: 9880
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9880&view=rev
Author: z-man
Date: 2011-09-04 14:13:15 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9873 to 9879:
------------------------------------------------------------------------
r9879 | bazaaarmagetron | 2011-09-03 01:09:12 +0200 (Sat, 03 Sep 2011) | 1 line
Manuel Moos: SPAM_MAXLEN can no loger be made so small an admin can't change it back up.
------------------------------------------------------------------------
r9877 | bazaaarmagetron | 2011-09-02 15:59:30 +0200 (Fri, 02 Sep 2011) | 2 lines
Manuel Moos: Caching found system library directories, the scan can take a while.
------------------------------------------------------------------------
r9876 | bazaaarmagetron | 2011-09-02 13:40:24 +0200 (Fri, 02 Sep 2011) | 2 lines
Manuel Moos: binary tarballs are considered Linux builds, too.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9873&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9879&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9877&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9876&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/language/english_base.txt
armagetronad/trunk/armagetronad/src/network/nSpamProtection.cpp
armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
armagetronad/trunk/build/WorkMakefile
armagetronad/trunk/build/portable/AppRun
armagetronad/trunk/build/scripts/lp-upload
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9873
/armagetronad/branches/0.2.8.3:9309-9740
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9879
/armagetronad/branches/0.2.8.3:9309-9740
Modified: armagetronad/trunk/armagetronad/language/english_base.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/english_base.txt 2011-09-02 23:09:12 UTC (rev 9879)
+++ armagetronad/trunk/armagetronad/language/english_base.txt 2011-09-04 14:13:15 UTC (rev 9880)
@@ -2986,6 +2986,7 @@
config_command_more There are more commands containing your search string that were left out to avoid flooding your terminal.\n
config_file_write_error Could not write configuration file!\n
config_value_changed \1 changed from \2 to \3.\n
+config_value_not_changed \1 not changed from \2 to \3: the guardian function objected.\n
config_error_read Input error reading \1: invalid format.\n
config_message_info \1 is currently set to \2.\n
config_sighup SIGHUP received, reloading configuration.\n
Modified: armagetronad/trunk/armagetronad/src/network/nSpamProtection.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nSpamProtection.cpp 2011-09-02 23:09:12 UTC (rev 9879)
+++ armagetronad/trunk/armagetronad/src/network/nSpamProtection.cpp 2011-09-04 14:13:15 UTC (rev 9880)
@@ -43,11 +43,20 @@
se_SpamAutoKick);
static tSettingItem<int> se_SAKC("SPAM_AUTOKICK_COUNT",
se_SpamAutoKickCount);
+
+// prevent spam_maxlen from being set so low no admin can increase it back up
+static bool sn_SpamMaxLenLimit(int const & value)
+{
+ static int minlen=strlen("/admin SPAM_MAXLEN 1000");
+ return value >= minlen;
+ // yeah, if the admin also logs out and it's rea...@cl...,
+ // he's screwed.
+}
static nSettingItemWatched<int> se_SML("SPAM_MAXLEN",
se_SpamMaxLen,
nConfItemVersionWatcher::Group_Cheating,
3 );
-static tAccessLevelSetter se_SMLAL( se_SML.GetSetting(), tAccessLevel_Owner );
+static tAccessLevelSetter se_SMLAL( se_SML.GetSetting().SetShouldChangeFunc(sn_SpamMaxLenLimit), tAccessLevel_Owner );
nSpamProtectionSettings::nSpamProtectionSettings( REAL timeScale, char const * timeScaleConfig, const tOutput& silence )
Modified: armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tConfiguration.h 2011-09-02 23:09:12 UTC (rev 9879)
+++ armagetronad/trunk/armagetronad/src/tools/tConfiguration.h 2011-09-04 14:13:15 UTC (rev 9880)
@@ -281,6 +281,13 @@
virtual ~tConfItem(){}
+ tConfItem<T> & SetShouldChangeFunc( ShouldChangeFuncT changeFunc )
+
+ {
+ this->shouldChangeFunc_ = changeFunc;
+ return *this;
+ }
+
typedef typename tTypeToConfig< T >::DUMMYREQUIRED DUMMYREQUIRED;
// read without conversion
@@ -326,6 +333,10 @@
*target = val;
changed = true;
}
+ else
+ {
+ con << tOutput("$config_value_not_changed", title, *target, val);
+ }
ExecuteCallback();
}
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-02 23:09:12 UTC (rev 9879)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-04 14:13:15 UTC (rev 9880)
@@ -519,7 +519,7 @@
binary_tarball: $(BINARY_TARBALL)
binary_tarball_data: $(BINARY_TARBALL_DATA)
binary_tarball_libs: $(BINARY_TARBALL_LIBS)
-$(TARBALL_DIR).tag: $(APPDIR).tag WorkMakefile $(UPLOAD)/.tag
+$(TARBALL_DIR).tag: $(APPDIR).tag WorkMakefile portable/AppRun $(UPLOAD)/.tag
#
# *****************************************
# * package client as tarball, preparation
Modified: armagetronad/trunk/build/portable/AppRun
===================================================================
--- armagetronad/trunk/build/portable/AppRun 2011-09-02 23:09:12 UTC (rev 9879)
+++ armagetronad/trunk/build/portable/AppRun 2011-09-04 14:13:15 UTC (rev 9880)
@@ -19,10 +19,15 @@
if test "x${LD_DEBUG_APP}" = xtrue; then
echo "Library debug mode: ignore system libraries."
else
- # find all directories in ld's cache
- for lib in $(ldconfig -p | tail -n +2 | sed -e "s,.* =>,," -e "s,/[^/]*$,," | sort -u); do
+ CACHE=~/.${EXEC}/.syslibs
+ if test ${0} -nt ${CACHE}; then
+ # find all directories in ld's cache
+ for lib in $(ldconfig -p | tail -n +2 | sed -e "s,.* =>,," -e "s,/[^/]*$,," | sort -u); do
extralib=${extralib}:${lib}
- done
+ done
+ echo ${extralib} > ${CACHE}
+ fi
+ extralib=$(cat ${CACHE})
fi
LD_LIBRARY_PATH="${root}/usr/local/lib:${LD_LIBRARY_PATH}${extralib}:${root}/usr/lib" PATH="${root}/usr/local/bin:${PATH}${root}/usr/bin" exec $EXEC ${extraarg} $@
Modified: armagetronad/trunk/build/scripts/lp-upload
===================================================================
--- armagetronad/trunk/build/scripts/lp-upload 2011-09-02 23:09:12 UTC (rev 9879)
+++ armagetronad/trunk/build/scripts/lp-upload 2011-09-04 14:13:15 UTC (rev 9880)
@@ -150,8 +150,10 @@
if "libs" in basename:
description="Library Tarball for Linux"
if extension == '.bz2':
+ Linux=True
mime_type="application/bzip2"
if extension == '.gz':
+ Linux=True
mime_type="application/x-gzip"
else:
if extension == ".package":
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-05 08:08:35
|
Revision: 9882
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9882&view=rev
Author: z-man
Date: 2011-09-05 08:08:28 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9879 to 9881:
------------------------------------------------------------------------
r9881 | bazaaarmagetron | 2011-09-05 03:43:18 +0200 (Mon, 05 Sep 2011) | 2 lines
Manuel Moos: Spam protection state now is stored in the machine, not the player.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9879&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9881&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/engine/eChat.cpp
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
armagetronad/trunk/armagetronad/src/engine/ePlayer.h
armagetronad/trunk/armagetronad/src/engine/eTeam.cpp
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9879
/armagetronad/branches/0.2.8.3:9309-9740
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9881
/armagetronad/branches/0.2.8.3:9309-9740
Modified: armagetronad/trunk/armagetronad/src/engine/eChat.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/eChat.cpp 2011-09-05 01:43:18 UTC (rev 9881)
+++ armagetronad/trunk/armagetronad/src/engine/eChat.cpp 2011-09-05 08:08:28 UTC (rev 9882)
@@ -272,7 +272,7 @@
nTimeRolling currentTime = tSysTimeFloat();
// check if the player already said the same thing not too long ago
- eChatLastSaid::SaidList const & lastSaid = player_->lastSaid_.LastSaid();
+ eChatLastSaid::SaidList const & lastSaid = player_->GetLastSaid().LastSaid();
const size_t saidSize = lastSaid.size();
for ( size_t i = 0; i < saidSize; i++ )
{
@@ -335,14 +335,14 @@
}
#endif
- player_->lastSaid_.AddSaid( saidEntry );
+ player_->GetLastSaid().AddSaid( saidEntry );
return false;
}
bool eChatSpamTester::CheckSpam( REAL factor, tOutput const & message ) const
{
- if ( nSpamProtection::Level_Mild <= player_->chatSpam_.CheckSpam( factor, player_->Owner(), message ) )
+ if ( nSpamProtection::Level_Mild <= player_->GetChatSpam().CheckSpam( factor, player_->Owner(), message ) )
return true;
return false;
@@ -390,7 +390,7 @@
}
- eChatLastSaid::SaidList & lastSaid = player_->lastSaid_.lastSaid_;
+ eChatLastSaid::SaidList & lastSaid = player_->GetLastSaid().lastSaid_;
// Map of Prefix => Data
std::map< tString, PrefixEntry > foundPrefixes;
@@ -434,7 +434,7 @@
#ifdef DEBUG
con << "Spam prefix found: \"" << se_EscapeColors( prefix ) << "\" with score " << data.score << '\n';
#endif
- nTimeRolling t = player_->lastSaid_.AddPrefix( prefix, data.score, say_.Time() );
+ nTimeRolling t = player_->GetLastSaid().AddPrefix( prefix, data.score, say_.Time() );
timeOut = RemainingTime( t );
// We caught the prefix. Don't catch words that start with the prefix.
@@ -460,7 +460,7 @@
data.score += se_CalcScore2( se_CountColorCodes( prefix ) * se_prefixSpamNumberColorCodesMultiplier );
// Apply based on number of known prefixes.
- data.score += se_CalcScore2( player_->lastSaid_.KnownPrefixes().size() * se_prefixNumberKnownPrefixesMultiplier );
+ data.score += se_CalcScore2( player_->GetLastSaid().KnownPrefixes().size() * se_prefixNumberKnownPrefixesMultiplier );
// Apply multiplier for annoying color messages
if ( se_StartsWithColorCode( prefix ) )
@@ -470,13 +470,13 @@
void eChatPrefixSpamTester::RemovePrefixEntries( const tString & prefix, const eChatSaidEntry & e ) const
{
eChatSaidEntry entry( prefix, e.Time(), e.Type() );
- eChatLastSaid::SaidList & xs = player_->lastSaid_.lastSaid_;
+ eChatLastSaid::SaidList & xs = player_->GetLastSaid().lastSaid_;
xs.erase( std::remove_if( xs.begin(), xs.end(), IsPrefixPredicate< eChatSaidEntry >( entry, false ) ), xs.end() );
}
bool eChatPrefixSpamTester::HasKnownPrefix( tString & out, nTimeRolling & timeOut ) const
{
- eChatLastSaid::PrefixList & prefixes = player_->lastSaid_.knownPrefixes_;
+ eChatLastSaid::PrefixList & prefixes = player_->GetLastSaid().knownPrefixes_;
eChatLastSaid::Prefix testPrefix( say_.Said(), 0, 0 );
eChatLastSaid::PrefixList::iterator it =
@@ -503,7 +503,7 @@
void eChatPrefixSpamTester::RemoveTimedOutPrefixes() const
{
- eChatLastSaid::PrefixList & xs = player_->lastSaid_.knownPrefixes_;
+ eChatLastSaid::PrefixList & xs = player_->GetLastSaid().knownPrefixes_;
tString empty;
eChatLastSaid::Prefix entry( empty, 0, say_.Time() );
xs.erase( std::remove_if( xs.begin(), xs.end(), TimeOutPredicate< eChatLastSaid::Prefix >( entry ) ), xs.end() );
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2011-09-05 01:43:18 UTC (rev 9881)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2011-09-05 08:08:28 UTC (rev 9882)
@@ -3555,9 +3555,9 @@
{
tASSERT( !CurrentTeam() );
- if ( shuffleSpam.ShouldAnnounce() )
+ if ( GetShuffleSpam().ShouldAnnounce() )
{
- sn_ConsoleOut( shuffleSpam.ShuffleMessage( this, pos+1 ) );
+ sn_ConsoleOut( GetShuffleSpam().ShuffleMessage( this, pos+1 ) );
}
teamListID = pos;
@@ -4521,8 +4521,44 @@
bool ePlayerNetID::Scramble = false;
std::vector<ePlayerNetID*> ePlayerNetID::ScramblePlayerIDs;
-ePlayerNetID::ePlayerNetID(int p):nNetObject(),listID(-1), teamListID(-1), timeCreated_( tSysTimeFloat() ), allowTeamChange_(false), registeredMachine_(0), pID(p), chatSpam_( se_chatSpamSettings )
+class eMachineDecoratorSpam: public nMachineDecorator
{
+public:
+ nSpamProtection chatSpam;
+ eShuffleSpamTester shuffleSpam;
+ eChatLastSaid lastSaid;
+
+ eMachineDecoratorSpam( nMachine & m ): nMachineDecorator( m ), chatSpam( se_chatSpamSettings ){}
+};
+
+static eMachineDecoratorSpam & se_GetSpam( ePlayerNetID & p )
+{
+ nMachine & machine = p.GetMachine();
+ eMachineDecoratorSpam * spam = machine.GetDecorator< eMachineDecoratorSpam >();
+ if( !spam )
+ {
+ spam = tNEW(eMachineDecoratorSpam)( machine );
+ }
+ return *spam;
+}
+
+nSpamProtection & ePlayerNetID::GetChatSpam()
+{
+ return se_GetSpam( *this ).chatSpam;
+}
+
+eChatLastSaid & ePlayerNetID::GetLastSaid()
+{
+ return se_GetSpam( *this ).lastSaid;
+}
+
+eShuffleSpamTester & ePlayerNetID::GetShuffleSpam()
+{
+ return se_GetSpam( *this ).shuffleSpam;
+}
+
+ePlayerNetID::ePlayerNetID(int p):nNetObject(),listID(-1), teamListID(-1), timeCreated_( tSysTimeFloat() ), allowTeamChange_(false), registeredMachine_(0), pID(p)
+{
// default access level
lastAccessLevel = tAccessLevel_Default;
@@ -6209,7 +6245,7 @@
//! creates a netobject form sync data
ePlayerNetID::ePlayerNetID( Engine::PlayerNetIDSync const & sync, nSenderInfo const & sender )
: nNetObject( sync.base(), sender ),listID(-1), teamListID(-1), timeCreated_( tSysTimeFloat() )
- , allowTeamChange_(false), registeredMachine_(0), chatSpam_( se_chatSpamSettings )
+ , allowTeamChange_(false), registeredMachine_(0)
{
// default access level
lastAccessLevel = tAccessLevel_Default;
@@ -8084,7 +8120,7 @@
// count it as spam if it is obnoxious
if ( obnoxious )
- chatSpam_.CheckSpam( 4.0, Owner(), tOutput("$spam_teamchage") );
+ GetChatSpam().CheckSpam( 4.0, Owner(), tOutput("$spam_teamchage") );
}
break;
@@ -9457,7 +9493,7 @@
for ( int i = se_PlayerNetIDs.Len()-1; i>=0; --i )
{
ePlayerNetID *p = se_PlayerNetIDs( i );
- p->shuffleSpam.Reset();
+ p->GetShuffleSpam().Reset();
}
}
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.h
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.h 2011-09-05 01:43:18 UTC (rev 9881)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.h 2011-09-05 08:08:28 UTC (rev 9882)
@@ -302,10 +302,9 @@
bool renameAllowed_; //!< specifies if the player is allowed to rename or not, does not know about votes.
- nSpamProtection chatSpam_;
-
- eChatLastSaid lastSaid_; //!< last said information
- eShuffleSpamTester shuffleSpam;
+ nSpamProtection & GetChatSpam(); //!< chat volume spam
+ eChatLastSaid & GetLastSaid(); //!< last said information
+ eShuffleSpamTester & GetShuffleSpam(); //!< shuffle message spam
ePlayerNetID(int p=-1);
virtual ~ePlayerNetID();
Modified: armagetronad/trunk/armagetronad/src/engine/eTeam.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/eTeam.cpp 2011-09-05 01:43:18 UTC (rev 9881)
+++ armagetronad/trunk/armagetronad/src/engine/eTeam.cpp 2011-09-05 08:08:28 UTC (rev 9882)
@@ -1712,11 +1712,11 @@
return;
ePlayerNetID *player = players[startID];
- eShuffleSpamTester & spam = player->shuffleSpam;
+ eShuffleSpamTester & spam = player->GetShuffleSpam();
if ( spam.ShouldAnnounce() )
{
- sn_ConsoleOut( player->shuffleSpam.ShuffleMessage( player, startID + 1, stopID + 1 ) );
+ sn_ConsoleOut( spam.ShuffleMessage( player, startID + 1, stopID + 1 ) );
}
// simply swap the one player over all the players in between.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-08 18:28:03
|
Revision: 9906
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9906&view=rev
Author: z-man
Date: 2011-09-08 18:27:55 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9881 to 9905:
------------------------------------------------------------------------
r9905 | bazaaarmagetron | 2011-09-08 18:38:34 +0200 (Thu, 08 Sep 2011) | 1 line
Manuel Moos: Fixed predictable typo in Windows only code
------------------------------------------------------------------------
r9904 | bazaaarmagetron | 2011-09-08 18:38:01 +0200 (Thu, 08 Sep 2011) | 1 line
Manuel Moos: --input now can be used more than once to read from multiple files or pipes.
------------------------------------------------------------------------
r9903 | bazaaarmagetron | 2011-09-08 18:37:16 +0200 (Thu, 08 Sep 2011) | 2 lines
Manuel Moos: Fixing spam protection memory leak.
------------------------------------------------------------------------
r9902 | bazaaarmagetron | 2011-09-07 00:27:41 +0200 (Wed, 07 Sep 2011) | 2 lines
Manuel Moos: Fixing absolute links in tarballs.
------------------------------------------------------------------------
r9901 | bazaaarmagetron | 2011-09-06 20:02:18 +0200 (Tue, 06 Sep 2011) | 5 lines
author: Manuel Moos
Server is now packed with /etc support files.
They don't work yet, though. They're absolute symbolic links into
nothing, and what they're supposed to be pointing at is not relocatable.
------------------------------------------------------------------------
r9900 | bazaaarmagetron | 2011-09-06 20:01:55 +0200 (Tue, 06 Sep 2011) | 2 lines
Manuel Moos: Adding first dedicated server builds.
------------------------------------------------------------------------
r9899 | bazaaarmagetron | 2011-09-06 20:01:22 +0200 (Tue, 06 Sep 2011) | 2 lines
Manuel Moos: Creating cache file directory now.
------------------------------------------------------------------------
r9898 | bazaaarmagetron | 2011-09-06 20:00:57 +0200 (Tue, 06 Sep 2011) | 2 lines
Manuel Moos: Corrected mistake in beta override.
------------------------------------------------------------------------
r9897 | bazaaarmagetron | 2011-09-06 20:00:31 +0200 (Tue, 06 Sep 2011) | 2 lines
Manuel Moos: Adding dedicated server feeds.
------------------------------------------------------------------------
r9896 | bazaaarmagetron | 2011-09-06 19:59:52 +0200 (Tue, 06 Sep 2011) | 2 lines
Manuel Moos: Added creation script.
------------------------------------------------------------------------
r9895 | bazaaarmagetron | 2011-09-06 19:59:22 +0200 (Tue, 06 Sep 2011) | 2 lines
Manuel Moos: Better xml file selection.
------------------------------------------------------------------------
r9894 | bazaaarmagetron | 2011-09-06 19:58:56 +0200 (Tue, 06 Sep 2011) | 2 lines
Manuel Moos: Adding prototype files.
------------------------------------------------------------------------
r9893 | bazaaarmagetron | 2011-09-06 19:58:31 +0200 (Tue, 06 Sep 2011) | 2 lines
Manuel Moos: Dedicated server support
------------------------------------------------------------------------
r9892 | bazaaarmagetron | 2011-09-06 19:58:05 +0200 (Tue, 06 Sep 2011) | 2 lines
Manuel Moos: Server tarballs.
------------------------------------------------------------------------
r9891 | bazaaarmagetron | 2011-09-06 19:57:39 +0200 (Tue, 06 Sep 2011) | 2 lines
Manuel Moos: Enabling portable server build.
------------------------------------------------------------------------
r9890 | bazaaarmagetron | 2011-09-06 13:38:09 +0200 (Tue, 06 Sep 2011) | 4 lines
author: Manuel Moos
Dropping Upload/* dependency of zeroinstall, instead let processes
that should cause a zeroinstall update delete the zeroinstall tag.
------------------------------------------------------------------------
r9886 | bazaaarmagetron | 2011-09-05 12:39:20 +0200 (Mon, 05 Sep 2011) | 1 line
Manuel Moos: Updating zeroinstall streams to version 0.2.8_alpha20110905
------------------------------------------------------------------------
r9885 | bazaaarmagetron | 2011-09-05 12:38:54 +0200 (Mon, 05 Sep 2011) | 1 line
Manuel Moos: Updating zeroinstall streams to version 0.2.8_alpha20110905
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9881&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9905&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9904&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9903&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9902&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9901&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9900&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9899&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9898&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9897&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9896&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9895&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9894&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9893&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9892&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9891&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9890&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9886&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9885&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/NEWS
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
armagetronad/trunk/armagetronad/src/render/rConsole.h
armagetronad/trunk/armagetronad/src/render/rConsoleCout.cpp
armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp
armagetronad/trunk/build/0install/armagetronad-alpha-Linux-i486.xml
armagetronad/trunk/build/0install/armagetronad-alpha-Linux-x86_64.xml
armagetronad/trunk/build/0install/update
armagetronad/trunk/build/WorkMakefile
armagetronad/trunk/build/portable/AppRun
armagetronad/trunk/build/portable/build
Added Paths:
-----------
armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-i486.xml
armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml
armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Windows.xml
armagetronad/trunk/build/0install/armagetronad-alpha-dedicated.xml
armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-i486.xml
armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-x86_64.xml
armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Windows.xml
armagetronad/trunk/build/0install/armagetronad-beta-dedicated.xml
armagetronad/trunk/build/0install/armagetronad-dedicated.xml
armagetronad/trunk/build/0install/armagetronad-proto-arch.xml
armagetronad/trunk/build/0install/armagetronad-proto.xml
armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-i486.xml
armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-x86_64.xml
armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Windows.xml
armagetronad/trunk/build/0install/armagetronad-stable-dedicated.xml
armagetronad/trunk/build/0install/create
armagetronad/trunk/build/portable/fixlinks
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9881
/armagetronad/branches/0.2.8.3:9309-9740
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9905
/armagetronad/branches/0.2.8.3:9309-9740
Modified: armagetronad/trunk/armagetronad/NEWS
===================================================================
--- armagetronad/trunk/armagetronad/NEWS 2011-09-08 16:38:34 UTC (rev 9905)
+++ armagetronad/trunk/armagetronad/NEWS 2011-09-08 18:27:55 UTC (rev 9906)
@@ -124,6 +124,7 @@
- GAME_END, NEW_MATCH, and NEW_ROUND ladderlog events include date and time.
- Added ENCODING ladderlog event, which specifies the encoding for data in
ladderlog.txt.
+- "--input" now can be used more than once to read from multiple files or pipes.
Changes since 0.2.8.3.1:
- security fix: old style action commands from clients no loger cause hangs and crashes
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2011-09-08 16:38:34 UTC (rev 9905)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2011-09-08 18:27:55 UTC (rev 9906)
@@ -4529,6 +4529,11 @@
eChatLastSaid lastSaid;
eMachineDecoratorSpam( nMachine & m ): nMachineDecorator( m ), chatSpam( se_chatSpamSettings ){}
+
+ virtual void OnDestroy()
+ {
+ delete this;
+ }
};
static eMachineDecoratorSpam & se_GetSpam( ePlayerNetID & p )
Modified: armagetronad/trunk/armagetronad/src/render/rConsole.h
===================================================================
--- armagetronad/trunk/armagetronad/src/render/rConsole.h 2011-09-08 16:38:34 UTC (rev 9905)
+++ armagetronad/trunk/armagetronad/src/render/rConsole.h 2011-09-08 18:27:55 UTC (rev 9906)
@@ -91,11 +91,7 @@
extern rConsole sr_con; // where all the output is directed to
#ifdef DEDICATED
-// read from sr_input
-extern FILE *sr_input;
-void sr_Unblock_stdin();
void sr_Read_stdin();
-void sr_Close_stdin();
#endif
class rForceTextCallback:public tCallbackOr{
Modified: armagetronad/trunk/armagetronad/src/render/rConsoleCout.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/render/rConsoleCout.cpp 2011-09-08 16:38:34 UTC (rev 9905)
+++ armagetronad/trunk/armagetronad/src/render/rConsoleCout.cpp 2011-09-08 18:27:55 UTC (rev 9906)
@@ -33,6 +33,7 @@
#include <stdio.h>
#include <fcntl.h>
#include <sstream>
+#include <errno.h>
#if HAVE_UNISTD_H
#include <unistd.h>
@@ -46,15 +47,92 @@
#include <signal.h>
#endif
+class rInputStream
+{
+public:
+#ifdef WIN32
+ typedef HANDLE Descriptor;
+#else
+ typedef int Descriptor;
+#endif
+
+ rInputStream( rInputStream const & other )
+ {
+ descriptor_ = other.descriptor_;
+ file_ = other.file_;
+ line_in_ = other.line_in_;
+ name_ = other.name_;
+
+ other.file_ = 0;
+ }
+
+ rInputStream & operator = ( rInputStream const & other )
+ {
+ descriptor_ = other.descriptor_;
+ file_ = other.file_;
+ line_in_ = other.line_in_;
+ name_ = other.name_;
+
+ other.file_ = 0;
+
+ return * this;
+ }
+
+ rInputStream()
+ {
+ descriptor_ =
+#ifdef WIN32
+ GetStdHandle(STD_INPUT_HANDLE);
+#else
+ fileno(stdin);
+#endif
+ file_ = NULL;
+
+ Unblock();
+ }
+
+ explicit rInputStream( Descriptor descriptor, char const * name, FILE * file = NULL )
+ : descriptor_( descriptor ), file_( file ), name_( name )
+ {
+ Unblock();
+ }
+
+ // reads from the descriptor and
+ // executes commands on newlines
+ void HandleInput();
+
+ ~rInputStream()
+ {
+ if( file_ )
+ {
+ fclose( file_ );
+ file_ = NULL;
+ }
+ }
+private:
+ void Unblock()
+ {
+#ifndef WIN32
+ int flag=fcntl(descriptor_,F_GETFL);
+ fcntl(descriptor_,F_SETFL,flag | O_NONBLOCK);
+#endif
+ }
+
+ Descriptor descriptor_;
+ mutable FILE * file_;
+ tString line_in_;
+ tString name_;
+};
+
void rConsole::DoCenterDisplay(const tString &s,REAL timeout,REAL r,REAL g,REAL b){
std::cout << tColoredString::RemoveColors(s) << '\n';
DisplayAtNewline();
}
-FILE *sr_input = stdin;
-static int stdin_descriptor;
static bool unblocked = false;
+void sr_Unblock_stdin();
+
static void sr_HandleSigCont( int signal )
{
// con << "Continuing.\n";
@@ -72,7 +150,7 @@
#endif
unblocked = true;
- stdin_descriptor=fileno( sr_input );
+ int stdin_descriptor=fileno( stdin );
#ifndef WIN32
// if (isatty(stdin_descriptor))
{
@@ -82,36 +160,95 @@
#endif
}
+static tArray< rInputStream > sr_inputStreams;
+static bool sr_daemon;
+void sr_Read_stdin(){
+ static bool inited = false;
+ if( !inited )
+ {
+ inited = true;
+ if( !sr_daemon )
+ {
+ sr_Unblock_stdin();
+ sr_inputStreams[sr_inputStreams.Len()]=rInputStream();
+ }
+ }
-#define MAXLINE 1000
-static char line_in[MAXLINE+2];
-static int currentIn=0;
+ for( int i = sr_inputStreams.Len()-1; i >= 0; --i )
+ {
+ sr_inputStreams[i].HandleInput();
+ }
+}
-void sr_Read_stdin(){
+#ifndef WIN32
+#include "tCommandLine.h"
+
+class rInputCommandLineAnalyzer: public tCommandLineAnalyzer
+{
+public:
+ virtual bool DoAnalyze( tCommandLineParser & parser )
+ {
+ tString pipe;
+ if ( parser.GetSwitch( "--daemon","-d") )
+ {
+ sr_daemon = true;
+
+ return true;
+ }
+ else if( parser.GetOption( pipe, "--input" ) )
+ {
+ FILE * f = fopen( pipe, "r" );
+ if( f )
+ {
+ sr_inputStreams[sr_inputStreams.Len()]=rInputStream( fileno(f), pipe, f );
+ fseek( f, 0, SEEK_END );
+ }
+ else
+ {
+ std::cerr << "Error opening input file '" << pipe << "': "
+ << strerror( errno ) << ". Using stdin to poll for input.\n";
+ }
+
+ return true;
+ }
+ return false;
+ }
+
+ virtual void DoHelp( std::ostream & s )
+ { //
+#ifndef WIN32
+ s << "-d, --daemon : allow the dedicated server to run as a daemon\n"
+ << " (will not poll for input, unless overridden by --input)\n";
+ s << "--input <file> : Poll for input from this file in addition to/instead of\n"
+ << " (if -d is also given) stdin. Can be used multiple times.\n";
+#endif
+ }
+};
+
+static rInputCommandLineAnalyzer sr_analyzer;
+#endif
+
+void rInputStream::HandleInput()
+{
// stdin commands are executed at owner level
tCurrentAccessLevel level( tAccessLevel_Owner, true );
tConfItemBase::LoadPlayback( true );
- if ( !unblocked )
- {
- return;
- }
#ifdef WIN32
// std::cerr << "\n";
- HANDLE stdinhandle = GetStdHandle(STD_INPUT_HANDLE);
HANDLE stdouthandle = GetStdHandle(STD_OUTPUT_HANDLE);
bool goon = true;
while (goon)
{
unsigned long reallyread;
INPUT_RECORD input;
- PeekConsoleInput(stdinhandle, &input, 1, &reallyread);
+ PeekConsoleInput(descriptor_, &input, 1, &reallyread);
if (reallyread > 0)
{
- ReadConsoleInput(stdinhandle, &input, 1, &reallyread);
+ ReadConsoleInput(descriptor_, &input, 1, &reallyread);
if (input.EventType == KEY_EVENT)
{
char key = input.Event.KeyEvent.uChar.AsciiChar;
@@ -120,21 +257,17 @@
if (key && input.Event.KeyEvent.bKeyDown)
{
WriteConsole(stdouthandle, &key, 1, &written, NULL);
- line_in[currentIn] = key;
+ line_in_ << key;
- if (key == 13 || currentIn>=MAXLINE-1){
- line_in[currentIn]='\n';
- line_in[currentIn+1]='\0';
- std::istringstream s(line_in);
+ if (key == 13 ){
+ line_in_<<'\n';
+ std::istringstream s((char const *)line_in_);
WriteConsole(stdouthandle, "\n", 1, &written, NULL);
tConfItemBase::LoadAll(s, true);
- currentIn=0;
+ line_in_="";
}
- else
- currentIn++;
}
}
- // bool ret=ReadFile(stdinhandle, &line_in[currentIn], 1, &reallyread, NULL);
}
else
goon = false;
@@ -142,26 +275,23 @@
#else
- while ( read(stdin_descriptor,&line_in[currentIn],1)>0){
- if (line_in[currentIn]=='\n' || currentIn>=MAXLINE-1)
+ char c;
+ while ( read(descriptor_,&c,1)>0){
+ line_in_ << c;
+ if (c=='\n')
{
- line_in[currentIn+1]='\0';
- std::istringstream s(line_in);
+ std::istringstream s((char const *)line_in_);
+ if( name_.Len() > 1 )
+ {
+ con << name_ << " : " << line_in_;
+ }
tConfItemBase::LoadAll(s, true);
- currentIn=0;
+ line_in_="";
}
- else
- currentIn++;
}
#endif
}
-void sr_Close_stdin()
-{
- fclose( sr_input );
-}
-
-
void rConsole::DisplayAtNewline(){
}
Modified: armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp 2011-09-08 16:38:34 UTC (rev 9905)
+++ armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp 2011-09-08 18:27:55 UTC (rev 9906)
@@ -57,7 +57,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <fstream>
-#include <errno.h>
#include "nServerInfo.h"
#include "nSocket.h"
@@ -81,43 +80,31 @@
class gMainCommandLineAnalyzer: public tCommandLineAnalyzer
{
public:
- bool daemon_;
bool fullscreen_;
bool windowed_;
bool use_directx_;
bool dont_use_directx_;
- tString inputFile_;
gMainCommandLineAnalyzer()
{
- daemon_ = false;
windowed_ = false;
fullscreen_ = false;
use_directx_ = false;
dont_use_directx_ = false;
- inputFile_ = "";
}
private:
virtual bool DoAnalyze( tCommandLineParser & parser )
{
- if ( parser.GetSwitch( "--daemon","-d") )
+ if ( parser.GetSwitch( "-fullscreen", "-f" ) )
{
- daemon_ = true;
- }
- else if ( parser.GetSwitch( "-fullscreen", "-f" ) )
- {
fullscreen_=true;
}
else if ( parser.GetSwitch( "-window", "-w" ) || parser.GetSwitch( "-windowed") )
{
windowed_=true;
}
- else if ( parser.GetOption( inputFile_, "--input" ) )
- {
- daemon_ = false;
- }
#ifdef WIN32
else if ( parser.GetSwitch( "+directx") )
{
@@ -146,13 +133,7 @@
<< " initialisation under MS Windows\n\n";
s << "\n\nYes, I know this looks ugly. Sorry about that.\n";
#endif
-#else
-#ifndef WIN32
- s << "-d, --daemon : allow the dedicated server to run as a daemon\n"
- << " (will not poll for input, unless overridden by --input)\n";
- s << "--input <file> : Poll for input from this file. Default is stdin\n";
#endif
-#endif
}
};
@@ -904,26 +885,6 @@
SDL_Quit();
#else // DEDICATED
- if (!commandLineAnalyzer.daemon_)
- {
- if ( commandLineAnalyzer.inputFile_.Len() > 1 )
- {
- FILE *in = fopen( commandLineAnalyzer.inputFile_, "r" );
- if ( in )
- {
- atexit( sr_Close_stdin );
- fseek( in, 0, SEEK_END );
- sr_input = in;
- }
- else
- {
- std::cerr << "Error opening input file '" << commandLineAnalyzer.inputFile_ << "': "
- << strerror( errno ) << ". Using stdin to poll for input.\n";
- }
- }
- sr_Unblock_stdin();
- }
-
sr_glOut=0;
// nServerInfo::TellMasterAboutMe();
Modified: armagetronad/trunk/build/0install/armagetronad-alpha-Linux-i486.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-Linux-i486.xml 2011-09-08 16:38:34 UTC (rev 9905)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-Linux-i486.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -27,5 +27,9 @@
<manifest-digest sha256="8724749ad55f630dd8e3e07a8b93b7e6ffbb083e9c0e8ed71ad56eff573f49d7"/>
<archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110829/+download/armagetronad-alpha-0.2.8_alpha20110829.i486-generic-linux-gnu.bin.tar.bz2" size="2122026"/>
</implementation>
+ <implementation id="sha1new=dbd921cd5192abda2a9eb9faedf541f1350406bc" main="AppRun" released="2011-09-05" version="0.2.8-pre0.20110905">
+ <manifest-digest sha256="fdfd0faf712f9ecf37db0dba2c08c2c15c47a5ee2b5af6a3d9657e96a868a5b8"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110905/+download/armagetronad-alpha-0.2.8_alpha20110905.i486-generic-linux-gnu.bin.tar.bz2" size="1670894"/>
+ </implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-alpha-Linux-x86_64.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-Linux-x86_64.xml 2011-09-08 16:38:34 UTC (rev 9905)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-Linux-x86_64.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -24,5 +24,9 @@
<manifest-digest sha256="a899a8a51b3674dd624754d9cc6dd311e154ca54012c03b32aa32d2d611b6e58"/>
<archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110829/+download/armagetronad-alpha-0.2.8_alpha20110829.x86_64-generic-linux-gnu.bin.tar.bz2" size="1746404"/>
</implementation>
+ <implementation id="sha1new=07360144e25777d90933a75985c2847ec8073dca" main="AppRun" released="2011-09-05" version="0.2.8-pre0.20110905">
+ <manifest-digest sha256="c0a8ff59a653d10253205114e78c40e223e767cf29211353fbe73d987c879afa"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110905/+download/armagetronad-alpha-0.2.8_alpha20110905.x86_64-generic-linux-gnu.bin.tar.bz2" size="1764958"/>
+ </implementation>
</group>
</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-i486.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-alpha-dedicated-Linux-i486.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-i486.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-i486.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-alpha-dedicated-Linux-i486.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Alpha Dedicated</name>
+ <summary>Tron clone in 3D Alpha Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="Linux-i486" stability="developer">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Linux-i486.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ </implementation>
+ <implementation id="sha1new=3dd0010177bf26f500570cb64d17718df3701435" main="AppRun" released="2011-09-06" version="0.2.8-pre0.20110905">
+ <manifest-digest sha256="dca22a2e57e9b322440209bd67f878abfc0a812c694f2648480ee61f8591ab2a"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110905/+download/armagetronad-alpha-dedicated-0.2.8_alpha20110905.i486-generic-linux-gnu.bin.tar.bz2" size="1106684"/>
+ </implementation>
+ </group>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Alpha Dedicated</name>
+ <summary>Tron clone in 3D Alpha Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="Linux-x86_64" stability="developer">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Linux-x86_64.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ </implementation>
+ </group>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Windows.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-alpha-dedicated-Windows.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Windows.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Windows.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-alpha-dedicated-Windows.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Alpha Dedicated</name>
+ <summary>Tron clone in 3D Alpha Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="Windows-*" stability="developer">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Windows.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ </implementation>
+ </group>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-alpha-dedicated.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-alpha-dedicated.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-dedicated.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-dedicated.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-alpha-dedicated.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Alpha Dedicated</name>
+ <summary>Tron clone in 3D Alpha Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <feed arch="Linux-i486" src="http://simamo.de/0install/armagetronad-alpha-dedicated-Linux-i486.xml"/>
+ <feed arch="Linux-x86_64" src="http://simamo.de/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml"/>
+ <feed arch="Windows-*" src="http://simamo.de/0install/armagetronad-alpha-dedicated-Windows.xml"/>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-i486.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-beta-dedicated-Linux-i486.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-i486.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-i486.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-beta-dedicated-Linux-i486.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Beta Dedicated</name>
+ <summary>Tron clone in 3D Beta Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="Linux-i486" stability="testing">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Linux-i486.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=3164d7bef0ebd21e0a9f513909108f38b9471e42" main="AppRun" released="2011-09-06" version="0.2.8.3.2-rc1">
+ <manifest-digest sha256="6372cdd6696ca9a31505c897241312ea4e8a18ff1ea9ded3178599b068d7ea6c"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2-rc1/+download/armagetronad-dedicated-0.2.8.3.2_rc1.i486-generic-linux-gnu.bin.tar.bz2" size="1106275"/>
+ </implementation>
+ </group>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-x86_64.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-beta-dedicated-Linux-x86_64.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-x86_64.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-x86_64.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-beta-dedicated-Linux-x86_64.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Beta Dedicated</name>
+ <summary>Tron clone in 3D Beta Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="Linux-x86_64" stability="testing">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Linux-x86_64.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ </implementation>
+ </group>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Windows.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-beta-dedicated-Windows.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Windows.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Windows.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-beta-dedicated-Windows.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Beta Dedicated</name>
+ <summary>Tron clone in 3D Beta Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="Windows-*" stability="testing">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Windows.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ </implementation>
+ </group>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-beta-dedicated.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-beta-dedicated.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-beta-dedicated.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-beta-dedicated.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-beta-dedicated.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Beta Dedicated</name>
+ <summary>Tron clone in 3D Beta Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <feed arch="Linux-i486" src="http://simamo.de/0install/armagetronad-beta-dedicated-Linux-i486.xml"/>
+ <feed arch="Linux-x86_64" src="http://simamo.de/0install/armagetronad-beta-dedicated-Linux-x86_64.xml"/>
+ <feed arch="Windows-*" src="http://simamo.de/0install/armagetronad-beta-dedicated-Windows.xml"/>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-dedicated.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-dedicated.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-dedicated.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-dedicated.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-dedicated.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Advanced</name>
+ <summary>Tron clone in 3D</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <feed arch="Linux-x86_64" src="http://simamo.de/0install/armagetronad-experimental-dedicated-Linux-x86_64.xml"/>
+ <feed arch="Linux-x86_64" src="http://simamo.de/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml"/>
+ <feed arch="Linux-x86_64" src="http://simamo.de/0install/armagetronad-beta-dedicated-Linux-x86_64.xml"/>
+ <feed arch="Linux-x86_64" src="http://simamo.de/0install/armagetronad-stable-dedicated-Linux-x86_64.xml"/>
+ <feed arch="Linux-i486" src="http://simamo.de/0install/armagetronad-experimental-dedicated-Linux-i486.xml"/>
+ <feed arch="Linux-i486" src="http://simamo.de/0install/armagetronad-alpha-dedicated-Linux-i486.xml"/>
+ <feed arch="Linux-i486" src="http://simamo.de/0install/armagetronad-beta-dedicated-Linux-i486.xml"/>
+ <feed arch="Linux-i486" src="http://simamo.de/0install/armagetronad-stable-dedicated-Linux-i486.xml"/>
+ <feed arch="Windows-*" src="http://simamo.de/0install/armagetronad-experimental-dedicated-Windows.xml"/>
+ <feed arch="Windows-*" src="http://simamo.de/0install/armagetronad-alpha-dedicated-Windows.xml"/>
+ <feed arch="Windows-*" src="http://simamo.de/0install/armagetronad-beta-dedicated-Windows.xml"/>
+ <feed arch="Windows-*" src="http://simamo.de/0install/armagetronad-stable-dedicated-Windows.xml"/>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-proto-arch.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-proto-arch.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-proto-arch.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-proto-arch.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-proto-os-arch.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Proto</name>
+ <summary>Tron clone in 3D Proto builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="os-arch" stability="developer">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-os-arch.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ </implementation>
+ </group>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-proto.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-proto.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-proto.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-proto.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-proto.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Proto</name>
+ <summary>Tron clone in 3D Proto builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <feed arch="Linux-i486" src="http://simamo.de/0install/armagetronad-proto-Linux-i486.xml"/>
+ <feed arch="Linux-x86_64" src="http://simamo.de/0install/armagetronad-proto-Linux-x86_64.xml"/>
+ <feed arch="Windows-*" src="http://simamo.de/0install/armagetronad-proto-Windows.xml"/>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-i486.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-stable-dedicated-Linux-i486.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-i486.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-i486.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-stable-dedicated-Linux-i486.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Stable Dedicated</name>
+ <summary>Tron clone in 3D Stable Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="Linux-i486" stability="stable">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Linux-i486.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=a969de284cbfb648041cb5fedea3051916297b42" main="AppRun" released="2011-09-06" version="0.2.8.3.1">
+ <manifest-digest sha256="0c3112bed0998083fb8b4812eebe587db66d7b14db0d905b4c3a2d3cdaa415f6"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.1/+download/armagetronad-dedicated-0.2.8.3.1.i486-generic-linux-gnu.bin.tar.bz2" size="1106581"/>
+ </implementation>
+ </group>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-x86_64.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-stable-dedicated-Linux-x86_64.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-x86_64.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-x86_64.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-stable-dedicated-Linux-x86_64.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Stable Dedicated</name>
+ <summary>Tron clone in 3D Stable Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="Linux-x86_64" stability="stable">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Linux-x86_64.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ </implementation>
+ </group>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Windows.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-stable-dedicated-Windows.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Windows.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Windows.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-stable-dedicated-Windows.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Stable Dedicated</name>
+ <summary>Tron clone in 3D Stable Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="Windows-*" stability="stable">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Windows.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ </implementation>
+ </group>
+</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-stable-dedicated.xml (from rev 9901, armagetronad/branches/0.2.8/build/0install/armagetronad-stable-dedicated.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-stable-dedicated.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-stable-dedicated.xml 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-stable-dedicated.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Stable Dedicated</name>
+ <summary>Tron clone in 3D Stable Dedicated builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <feed arch="Linux-i486" src="http://simamo.de/0install/armagetronad-stable-dedicated-Linux-i486.xml"/>
+ <feed arch="Linux-x86_64" src="http://simamo.de/0install/armagetronad-stable-dedicated-Linux-x86_64.xml"/>
+ <feed arch="Windows-*" src="http://simamo.de/0install/armagetronad-stable-dedicated-Windows.xml"/>
+</interface>
Copied: armagetronad/trunk/build/0install/create (from rev 9901, armagetronad/branches/0.2.8/build/0install/create)
===================================================================
--- armagetronad/trunk/build/0install/create (rev 0)
+++ armagetronad/trunk/build/0install/create 2011-09-08 18:27:55 UTC (rev 9906)
@@ -0,0 +1,27 @@
+#!/bin/bash
+# creates new 0install feeeds
+
+STABILITY=$1
+SUFFIX=$2
+NAMESUFFIX=$3
+
+if test -z "$1"; then
+ echo "Usage: create stability suffix namesuffix, i.e."
+ echo " create develioper -alpha Alpha"
+ exit
+fi
+
+test -z "${NAMESUFFIX}" || NAMESUFFIX=" ${NAMESUFFIX}"
+
+cd $(dirname $0)
+sed < armagetronad-proto.xml > armagetronad${SUFFIX}.xml \
+-e "s,-proto,${SUFFIX},g" -e "s, Proto,${NAMESUFFIX},g"
+for arch in Linux-i486 Linux-x86_64 Windows; do
+ ARCH=${arch}
+ test ${arch} = Windows && ARCH="Windows-*"
+ sed < armagetronad-proto-arch.xml > armagetronad${SUFFIX}-${arch}.xml \
+ -e "s,-proto,${SUFFIX},g" -e "s, Proto,${NAMESUFFIX},g" \
+ -e "s,-os-arch,-${arch},g" -e "s,os-arch,${ARCH},g" \
+ -e "s,developer,${STABILITY},g"
+done
+
Modified: armagetronad/trunk/build/0install/update
===================================================================
--- armagetronad/trunk/build/0install/update 2011-09-08 16:38:34 UTC (rev 9905)
+++ armagetronad/trunk/build/0install/update 2011-09-08 18:27:55 UTC (rev 9906)
@@ -27,12 +27,13 @@
WINURI=http://launchpad.net/armagetronad/${SERIES}/${LPVERSION}/+download/$(basename ${WINFILE})
# determine xml to modify
-XML=
-test "${SERIES}" == "0.2.8" && XML=0install/armagetronad-beta
-test "${SERIES}" == "0.2.8-snapshots" && XML=0install/armagetronad-alpha
-test "${SERIES}" == "trunk-snapshots" && XML=0install/armagetronad-experimental
-test -z ${XML} && { echo "Unknown series: ${SERIES}"; exit 1; }
+XML=0install/${PACKAGE}
+# exception: plain 0.2.8 builds always go to the beta feed first
+if test ${SERIES} == 0.2.8; then
+ echo ${PACKAGE} | grep beta || XML=$(echo ${XML} | sed -e 's,armagetronad,armagetronad-beta,')
+fi
+
OS=Linux
CPU=$(echo ${OSTAG_GENERIC} | sed -e "s,-.*,,")
ARCH=${OS}-${CPU}
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-08 16:38:34 UTC (rev 9905)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-08 18:27:55 UTC (rev 9906)
@@ -49,9 +49,11 @@
test -d $(UPLOAD) || mkdir $(UPLOAD)
echo "" > $@
+ZEROINSTTAG=$(RCDIR)/.$(BINARY_TARBALL_NAME).0installtag
+
uploadcheck: $(UPLOAD)/.tag
# check for windows build directory dumped into Upload
- if test -d $(UPLOAD)/dist; then RCDIR=$(RCDIR) VERSION=$(VERSION) PACKAGE=${PACKAGE} scripts/handledist; fi
+ if test -d $(UPLOAD)/dist; then RCDIR=$(RCDIR) VERSION=$(VERSION) PACKAGE=${PACKAGE} scripts/handledist; rm -f $(ZEROINSTTAG); fi
# bump rc number
bump:
@@ -448,6 +450,8 @@
# generic client build
GENERIC_CLIENT_DIR=$(RCDIR)/client.build
+GENERIC_CONFIGURE_ARGUMENTS=--prefix='/usr/local' --disable-uninstall --disable-restoreold --enable-etc --enable-automakedefaults --disable-useradd
+CLIENT_CONFIGURE_ARGUMENTS=${GENERIC_CONFIGURE_ARGUMENTS} --disable-sysinstall --disable-initscripts
generic_client: $(GENERIC_CLIENT_DIR).tag
$(GENERIC_CLIENT_DIR).tag: $(SOURCEDIR)/.tag
#
@@ -460,7 +464,7 @@
mkdir -p $(GENERIC_CLIENT_DIR)
# configure and make
- bash scripts/configure $(GENERIC_CLIENT_DIR) $(SOURCEDIR) --prefix='/usr/local' --disable-uninstall --disable-sysinstall --disable-restoreold --enable-etc --disable-initscripts --enable-automakedefaults --disable-useradd --enable-armathentication
+ bash scripts/configure $(GENERIC_CLIENT_DIR) $(SOURCEDIR) $(CLIENT_CONFIGURE_ARGUMENTS)
${MAKE} -C $(GENERIC_CLIENT_DIR)
@@ -469,31 +473,52 @@
touch $@
+GENERIC_SERVER_DIR=$(RCDIR)/server.build
+SERVER_CONFIGURE_ARGUMENTS=$(GENERIC_CONFIGURE_ARGUMENTS) --disable-glout --enable-armathentication
+generic_server: $(GENERIC_SERVER_DIR).tag
+$(GENERIC_SERVER_DIR).tag: $(SOURCEDIR)/.tag
+ #
+ # *****************************************
+ # * generic server build
+ # *****************************************
+ #
+ # create build directory
+ rm -rf $(GENERIC_SERVER_DIR)/config.cache $(GENERIC_SERVER_DIR)/Makefile
+ mkdir -p $(GENERIC_SERVER_DIR)
+
+ # configure and make
+ bash scripts/configure $(GENERIC_SERVER_DIR) $(SOURCEDIR) $(SERVER_CONFIGURE_ARGUMENTS)
+
+ ${MAKE} -C $(GENERIC_SERVER_DIR)
+ touch $@
+
+generic_build: generic_client generic_server
+
# portable client build
PORTABLE_CLIENT_BASENAME=$(subst ",,${PROGNAME})
#"
PORTABLE_CLIENT_NAME=$(shell echo ${PORTABLE_CLIENT_BASENAME} | sed -e "s, ,,g")
-APPDIR=$(RCDIR)/$(PORTABLE_CLIENT_NAME).AppDir
+APPDIR_CLIENT=$(RCDIR)/$(PORTABLE_CLIENT_NAME).AppDir
PORTABLE_CLIENT=$(UPLOAD)/$(PORTABLE_CLIENT_NAME)_${VERSION}
appdir: $(APPDIR).tag
portable_client: $(PORTABLE_CLIENT)
-$(APPDIR).tag: $(GENERIC_CLIENT_DIR).tag portable/AppRun portable/build $(UPLOAD)/.tag
+$(APPDIR_CLIENT).tag: $(GENERIC_CLIENT_DIR).tag portable/AppRun portable/build portable/fixlinks $(UPLOAD)/.tag
#
# *****************************************
# * package portable client, appdir
# *****************************************
#
# install into appdir
- rm -rf ${APPDIR}
- ${MAKE} -C ${GENERIC_CLIENT_DIR} DESTDIR=$$(pwd)/${APPDIR} install
+ rm -rf ${APPDIR_CLIENT}
+ ${MAKE} -C ${GENERIC_CLIENT_DIR} DESTDIR=$$(pwd)/${APPDIR_CLIENT} install
# delegate
- APPDIR=${APPDIR} PORTABLE_CLIENT=${PORTABLE_CLIENT} PACKAGE=${PACKAGE} portable/build
+ APPDIR=${APPDIR_CLIENT} PORTABLE=${PORTABLE_CLIENT} PACKAGE=${PACKAGE} portable/build
# mark
touch $@
-$(PORTABLE_CLIENT): $(APPDIR).tag
+$(PORTABLE_CLIENT): $(APPDIR_CLIENT).tag
#
# *****************************************
# * package portable client, appimage
@@ -504,85 +529,144 @@
# called AppImageAssistant; fetch it and extract it with AppImageExtractor
# to /usr/local/bin/.
rm -f $@
- /usr/local/bin/AppImageAssistant.AppDir/package ${APPDIR} ${PORTABLE_CLIENT}
+ /usr/local/bin/AppImageAssistant.AppDir/package ${APPDIR_CLIENT} ${PORTABLE_CLIENT}
+# portable server build
+PORTABLE_SERVER_BASENAME=$(subst ",,${PROGNAME})Dedicated
+#"
+PORTABLE_SERVER_NAME=$(shell echo ${PORTABLE_SERVER_BASENAME} | sed -e "s, ,,g")
+APPDIR_SERVER=$(RCDIR)/$(PORTABLE_SERVER_NAME).AppDir
+PORTABLE_SERVER=$(UPLOAD)/$(PORTABLE_SERVER_NAME)_${VERSION}
+portable_server: $(PORTABLE_SERVER)
+$(APPDIR_SERVER).tag: $(GENERIC_SERVER_DIR).tag portable/AppRun portable/build portable/fixlinks WorkMakefile $(UPLOAD)/.tag
+ #
+ # *****************************************
+ # * package portable server
+ # *****************************************
+ #
+# install into appdir
+ rm -rf ${APPDIR_SERVER}
+ ${MAKE} -C ${GENERIC_SERVER_DIR} DESTDIR=$$(pwd)/${APPDIR_SERVER} install
+
+# delegate
+ APPDIR=${APPDIR_SERVER} PORTABLE=${PORTABLE_SERVER} PACKAGE=${PACKAGE}-dedicated portable/build
+
+$(PORTABLE_SERVER): $(APPDIR_SERVER).tag
+
+# and pack it up. The script is stupidly only available inside a portable app
+# called AppImageAssistant; fetch it and extract it with AppImageExtractor
+# to /usr/local/bin/.
+ rm -f $@
+ /usr/local/bin/AppImageAssistant.AppDir/package ${APPDIR_SERVER} ${PORTABLE_SERVER}
+
# plain binary tarball
-PORTABLE_CLIENT_NAME=$(shell echo ${PORTABLE_CLIENT_BASENAME} | sed -e "s, ,,g")
-BINARY_TARBALL_NAME=${PACKAGE}-${VERSION}.${OSTAG_GENERIC}
+BINARY_CLIENT_TARBALL_NAME=${PACKAGE}-${VERSION}.${OSTAG_GENERIC}
BINARY_TARBALL_DATA_NAME=${PACKAGE}-data-${VERSION}
BINARY_TARBALL_LIBS_NAME=${PACKAGE}-libs-${VERSION}.${OSTAG_GENERIC}
-TARBALL_DIR=$(RCDIR)/$(BINARY_TARBALL_NAME).fortar
-binary_tarball_dir: $(TARBALL_DIR).tag
-BINARY_TARBALL=$(UPLOAD)/$(BINARY_TARBALL_NAME).bin.tar.bz2
+CLIENT_TARBALL_DIR=$(RCDIR)/$(BINARY_CLIENT_TARBALL_NAME).fortar
+binary_tarball_dir: $(CLIENT_TARBALL_DIR).tag
+BINARY_CLIENT_TARBALL=$(UPLOAD)/$(BINARY_CLIENT_TARBALL_NAME).bin.tar.bz2
BINARY_TARBALL_DATA=$(UPLOAD)/$(BINARY_TARBALL_DATA_NAME).bin.tar.bz2
BINARY_TARBALL_LIBS=$(UPLOAD)/$(BINARY_TARBALL_LIBS_NAME).bin.tar.bz2
-binary_tarball: $(BINARY_TARBALL)
+binary_tarball: $(BINARY_CLIENT_TARBALL)
binary_tarball_data: $(BINARY_TARBALL_DATA)
binary_tarball_libs: $(BINARY_TARBALL_LIBS)
-$(TARBALL_DIR).tag: $(APPDIR).tag WorkMakefile portable/AppRun $(UPLOAD)/.tag
+$(CLIENT_TARBALL_DIR).tag: $(APPDIR_CLIENT).tag WorkMakefile portable/AppRun $(UPLOAD)/.tag
#
# *****************************************
# * package client as tarball, preparation
# *****************************************
#
# copy appdir into tarball directories
- rm -rf ${TARBALL_DIR}
- mkdir -p ${TARBALL_DIR}
- cp -ax ${APPDIR}/usr ${TARBALL_DIR}/
+ rm -rf ${CLIENT_TARBALL_DIR}
+ mkdir -p ${CLIENT_TARBALL_DIR}
+ cp -ax ${APPDIR_CLIENT}/usr ${CLIENT_TARBALL_DIR}/
# get ...
[truncated message content] |
![http://simamo.de/0install/armagetronad.png"](http://simamo.de/0install/armagetronad.png"){kind=link}
|
From: <z-...@us...> - 2011-09-11 11:54:00
|
Revision: 9919
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9919&view=rev
Author: z-man
Date: 2011-09-11 11:53:53 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9905 to 9918:
------------------------------------------------------------------------
r9918 | z-man | 2011-09-11 13:05:32 +0200 (Sun, 11 Sep 2011) | 13 lines
Merging branch 0.2.8.3 from revision 9740 to 9917:
------------------------------------------------------------------------
r9914 | z-man | 2011-09-11 12:40:11 +0200 (Sun, 11 Sep 2011) | 2 lines
Updating NEWS.
------------------------------------------------------------------------
r9910 | z-man | 2011-09-11 12:36:02 +0200 (Sun, 11 Sep 2011) | 2 lines
Only loading .cfg files from the var subfolder.
------------------------------------------------------------------------
------------------------------------------------------------------------
r9909 | bazaaarmagetron | 2011-09-11 00:02:30 +0200 (Sun, 11 Sep 2011) | 4 lines
author: Manuel Moos
Made configuration map readable by everyone;
Conf items now distinguish between wanting to be saved and being able to be saved.
------------------------------------------------------------------------
r9908 | bazaaarmagetron | 2011-09-11 00:01:54 +0200 (Sun, 11 Sep 2011) | 2 lines
Manuel Moos: Added more flexible tPath::GetPaths()
------------------------------------------------------------------------
r9907 | bazaaarmagetron | 2011-09-11 00:01:16 +0200 (Sun, 11 Sep 2011) | 2 lines
Manuel Moos: Const correctness of some functions.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9905&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9918&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9740&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9914&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9910&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9909&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9908&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9907&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/NEWS
armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp
armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
armagetronad/trunk/armagetronad/src/tools/tDirectories.cpp
armagetronad/trunk/armagetronad/src/tools/tDirectories.h
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9905
/armagetronad/branches/0.2.8.3:9309-9740
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9918
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/armagetronad/NEWS
===================================================================
--- armagetronad/trunk/armagetronad/NEWS 2011-09-11 11:05:32 UTC (rev 9918)
+++ armagetronad/trunk/armagetronad/NEWS 2011-09-11 11:53:53 UTC (rev 9919)
@@ -130,6 +130,7 @@
- security fix: old style action commands from clients no loger cause hangs and crashes
- security fix: oversized packets are ignored properly
- security fix: never read one byte outside of the received buffer
+- security fix: only include .cfg files from the var subfolder
- compiler compatibility: adapted to gcc 4.60
- smaller spelling fixes
- FOV calculations now correct for widescreen and horizontal splitscreen
Modified: armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp 2011-09-11 11:05:32 UTC (rev 9918)
+++ armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp 2011-09-11 11:53:53 UTC (rev 9919)
@@ -149,6 +149,11 @@
return *st_confMap;
}
+tConfItemBase::tConfItemMap const & tConfItemBase::GetConfItemMap()
+{
+ return ConfItemMap();
+}
+
static bool st_preventCasacl = false;
tCasaclPreventer::tCasaclPreventer( bool prevent )
@@ -162,6 +167,12 @@
st_preventCasacl = previous_;
}
+//! returns whether we're currently in an RINCLUDE file
+bool tCasaclPreventer::InRInclude()
+{
+ return st_preventCasacl;
+}
+
// changes the access level of a configuration item
class tConfItemLevel: public tConfItemBase
{
@@ -201,8 +212,23 @@
{
// and change the level
tConfItemBase * ci = (*iter).second;
- if ( ci->requiredLevel != level )
+
+ if( ci->requiredLevel < tCurrentAccessLevel::GetAccessLevel() )
{
+ con << tOutput( "$access_level_nochange_now",
+ name,
+ tCurrentAccessLevel::GetName( ci->requiredLevel ),
+ tCurrentAccessLevel::GetName( tCurrentAccessLevel::GetAccessLevel() ) );
+ }
+ else if( level < tCurrentAccessLevel::GetAccessLevel() )
+ {
+ con << tOutput( "$access_level_nochange_later",
+ name,
+ tCurrentAccessLevel::GetName( level ),
+ tCurrentAccessLevel::GetName( tCurrentAccessLevel::GetAccessLevel() ) );
+ }
+ else if ( ci->requiredLevel != level )
+ {
ci->requiredLevel = level;
if(printChange)
{
@@ -228,6 +254,11 @@
virtual bool Save(){
return false;
}
+
+ // CAN this be saved at all?
+ virtual bool CanSave(){
+ return false;
+ }
};
static tConfItemLevel st_confLevel;
@@ -265,7 +296,7 @@
else if ( tCurrentAccessLevel::GetAccessLevel() > required )
{
con << tOutput( "$access_level_error",
- "SUDO",
+ "CASACL",
tCurrentAccessLevel::GetName( required ),
tCurrentAccessLevel::GetName( tCurrentAccessLevel::GetAccessLevel() )
);
@@ -295,6 +326,11 @@
virtual bool Save(){
return false;
}
+
+ // CAN this be saved at all?
+ virtual bool CanSave(){
+ return false;
+ }
};
static tCasacl st_sudo;
@@ -780,11 +816,11 @@
//! @param s file stream to be used for reading later
//! @param filename name of the file to open
-//! @param var whether to look in var directory
+//! @param path whether to look in var directory
//! @return success flag
bool tConfItemBase::OpenFile( std::ifstream & s, tString const & filename, SearchPath path )
{
- bool ret = ( ( path & Config ) && tDirectories::Config().Open(s, filename ) ) || ( ( path & Var ) && tDirectories::Var().Open(s, filename ) );
+ bool ret = ( ( path & Config ) && tDirectories::Config().Open(s, filename ) ) || ( ( path & Var ) && filename.EndsWith(".cfg") && tDirectories::Var().Open(s, filename ) );
static char const * section = "INCLUDE_VOTE";
tRecorder::Playback( section, ret );
@@ -1075,7 +1111,7 @@
if ( !tRecorder::IsPlayingBack() )
{
// really load include file
- if ( !Load( tDirectories::Var(), file ) )
+ if ( !file.EndsWith(".cfg") || !Load( tDirectories::Var(), file ) )
{
if (!Load( tDirectories::Config(), file ) && tConfItemBase::printErrors )
{
Modified: armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tConfiguration.h 2011-09-11 11:05:32 UTC (rev 9918)
+++ armagetronad/trunk/armagetronad/src/tools/tConfiguration.h 2011-09-11 11:53:53 UTC (rev 9919)
@@ -44,6 +44,7 @@
//! access levels for admin interfaces; lower numeric values are better
enum tAccessLevel
{
+ tAccessLevel_Shell = -1, // the server sysadmin
tAccessLevel_Owner = 0, // the server owner
tAccessLevel_Admin = 1, // one of his admins
tAccessLevel_Moderator = 2, // one of the moderators
@@ -81,6 +82,8 @@
public:
tCasaclPreventer( bool prevent = true );
~tCasaclPreventer();
+
+ static bool InRInclude(); //!< returns whether we're currently in an RINCLUDE file
private:
bool previous_; //!< previous value of prevention flag
};
@@ -124,8 +127,13 @@
tAccessLevel requiredLevel; //!< access level required to change this setting
tAccessLevel setLevel; //!< access level of the user making the last change to this setting
+public:
+ // the map of all configuration items
typedef std::map< tString, tConfItemBase * > tConfItemMap;
+ static tConfItemMap const & GetConfItemMap();
+protected:
static tConfItemMap & ConfItemMap();
+public:
public:
typedef void callbackFunc(void);
@@ -183,9 +191,15 @@
return true;
}
+ // should this be saved into user.cfg?
virtual bool Save(){
return true;
}
+
+ // CAN this be saved at all?
+ virtual bool CanSave(){
+ return true;
+ }
};
//! just to do some work in static initializers, to modify default access levels:
Modified: armagetronad/trunk/armagetronad/src/tools/tDirectories.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tDirectories.cpp 2011-09-11 11:05:32 UTC (rev 9918)
+++ armagetronad/trunk/armagetronad/src/tools/tDirectories.cpp 2011-09-11 11:53:53 UTC (rev 9919)
@@ -1682,6 +1682,17 @@
return ret;
}
+tString tPath::GetPaths(char const * delimiter, char const * finalizer) const {
+ tString ret;
+ tArray<tString> paths;
+ Paths(paths);
+ for (int i = 0; i < paths.Len(); ++i) {
+ ret << paths[i];
+ ret << ( (i == paths.Len() - 1) ? finalizer : delimiter );
+ }
+ return ret;
+}
+
extern char *st_userConfigs[];
void st_PrintPathInfo(tOutput &buf) {
tString const hcol("0xff8888");
Modified: armagetronad/trunk/armagetronad/src/tools/tDirectories.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tDirectories.h 2011-09-11 11:05:32 UTC (rev 9918)
+++ armagetronad/trunk/armagetronad/src/tools/tDirectories.h 2011-09-11 11:53:53 UTC (rev 9919)
@@ -52,11 +52,12 @@
static bool IsValidPath( char const * filename ); //!< checks whether filename is valid, i.e. does not endanger system security.
tString GetPaths(void) const; //!< Puts all paths into a tString for outputting to the user
+ tString GetPaths(char const * delimiter, char const * finalizer) const; //!< Puts all paths into a tString for outputting to the user
tPath(){}
virtual ~tPath(){}
protected:
- virtual void Paths ( tArray< tString >& paths ) const = 0; // maximum priority
+ virtual void Paths ( tArray< tString >& paths ) const = 0; // maximum priority is given to paths[0]
};
class tPathResource: public tPath {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-12 10:38:22
|
Revision: 9929
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9929&view=rev
Author: z-man
Date: 2011-09-12 10:38:15 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9918 to 9928:
------------------------------------------------------------------------
r9928 | bazaaarmagetron | 2011-09-12 12:01:05 +0200 (Mon, 12 Sep 2011) | 2 lines
Manuel Moos: Don't forget to upload the portable server.
------------------------------------------------------------------------
r9927 | bazaaarmagetron | 2011-09-12 12:00:39 +0200 (Mon, 12 Sep 2011) | 2 lines
Manuel Moos: Marking old builds (especially dummy ones) as insecure.
------------------------------------------------------------------------
r9926 | bazaaarmagetron | 2011-09-12 11:59:48 +0200 (Mon, 12 Sep 2011) | 1 line
Manuel Moos: Updating zeroinstall streams to version 0.2.8_alpha20110912
------------------------------------------------------------------------
r9922 | bazaaarmagetron | 2011-09-11 18:06:25 +0200 (Sun, 11 Sep 2011) | 1 line
Daniel Lee Harple: Add configure check for -Wno-unused-but-set-variable compiler flag.
------------------------------------------------------------------------
r9921 | bazaaarmagetron | 2011-09-11 17:59:37 +0200 (Sun, 11 Sep 2011) | 1 line
Manuel Moos: Updating zeroinstall streams to version 0.2.8.3.2
------------------------------------------------------------------------
r9920 | bazaaarmagetron | 2011-09-11 15:32:10 +0200 (Sun, 11 Sep 2011) | 2 lines
Manuel Moos: Access level -1 is not really needed.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9918&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9928&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9927&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9926&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9922&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9921&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9920&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/configure.ac
armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
armagetronad/trunk/build/0install/armagetronad-alpha-Linux-i486.xml
armagetronad/trunk/build/0install/armagetronad-alpha-Linux-x86_64.xml
armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-i486.xml
armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml
armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Windows.xml
armagetronad/trunk/build/0install/armagetronad-beta-Windows.xml
armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-i486.xml
armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-x86_64.xml
armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Windows.xml
armagetronad/trunk/build/0install/armagetronad-proto-arch.xml
armagetronad/trunk/build/0install/armagetronad-stable-Linux-i486.xml
armagetronad/trunk/build/0install/armagetronad-stable-Linux-x86_64.xml
armagetronad/trunk/build/0install/armagetronad-stable-Windows.xml
armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-i486.xml
armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-x86_64.xml
armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Windows.xml
armagetronad/trunk/build/WorkMakefile
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9918
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9928
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/armagetronad/configure.ac
===================================================================
--- armagetronad/trunk/armagetronad/configure.ac 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/armagetronad/configure.ac 2011-09-12 10:38:15 UTC (rev 9929)
@@ -393,7 +393,9 @@
# unused variables should be tolerated while debugging, they're sometimes just there
# to be printed in the debugger
-test $CODELEVEL -ge 1 && test $DEBUGLEVEL -ge 1 && CXXFLAGS="$CXXFLAGS -Wno-unused-but-set-variable"
+if test $CODELEVEL -ge 1 && test $DEBUGLEVEL -ge 1; then
+ AX_CXXFLAGS_GCC_OPTION(-Wno-unused-but-set-variable)
+fi
dnl determine whether "games" should be put into paths: not if it was
dnl requested with --disable-games or if "games" is already included
Modified: armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tConfiguration.h 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/armagetronad/src/tools/tConfiguration.h 2011-09-12 10:38:15 UTC (rev 9929)
@@ -44,7 +44,6 @@
//! access levels for admin interfaces; lower numeric values are better
enum tAccessLevel
{
- tAccessLevel_Shell = -1, // the server sysadmin
tAccessLevel_Owner = 0, // the server owner
tAccessLevel_Admin = 1, // one of his admins
tAccessLevel_Moderator = 2, // one of the moderators
Modified: armagetronad/trunk/build/0install/armagetronad-alpha-Linux-i486.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-Linux-i486.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-Linux-i486.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -31,5 +31,9 @@
<manifest-digest sha256="fdfd0faf712f9ecf37db0dba2c08c2c15c47a5ee2b5af6a3d9657e96a868a5b8"/>
<archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110905/+download/armagetronad-alpha-0.2.8_alpha20110905.i486-generic-linux-gnu.bin.tar.bz2" size="1670894"/>
</implementation>
+ <implementation id="sha1new=68e0932e2179ee4958305d63e918a53afbc1f137" main="AppRun" released="2011-09-12" version="0.2.8-pre0.20110912">
+ <manifest-digest sha256="991f2bd21f9892dbbb4b5fede6a452e4448562c6c61cea55baef5458057d76fd"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110912/+download/armagetronad-alpha-0.2.8_alpha20110912.i486-generic-linux-gnu.bin.tar.bz2" size="1623812"/>
+ </implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-alpha-Linux-x86_64.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-Linux-x86_64.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-Linux-x86_64.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -28,5 +28,9 @@
<manifest-digest sha256="c0a8ff59a653d10253205114e78c40e223e767cf29211353fbe73d987c879afa"/>
<archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110905/+download/armagetronad-alpha-0.2.8_alpha20110905.x86_64-generic-linux-gnu.bin.tar.bz2" size="1764958"/>
</implementation>
+ <implementation id="sha1new=e8466392699a8a10d496821f05bb0959a4519e0e" main="AppRun" released="2011-09-12" version="0.2.8-pre0.20110912">
+ <manifest-digest sha256="9d1c4936427787680c69e2b19250c5f3c1aa7f09c51ca794777d5baa616a92b4"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110912/+download/armagetronad-alpha-0.2.8_alpha20110912.x86_64-generic-linux-gnu.bin.tar.bz2" size="1707475"/>
+ </implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-i486.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-i486.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-i486.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -15,16 +15,24 @@
<homepage>http://armagetronad.net</homepage>
<category>Game</category>
<icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
- <group arch="Linux-i486" stability="developer">
+ <group arch="Linux-i486" stability="insecure">
<requires interface="http://simamo.de/0install/armagetronad-libs-Linux-i486.xml">
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
- </implementation>
<implementation id="sha1new=3dd0010177bf26f500570cb64d17718df3701435" main="AppRun" released="2011-09-06" version="0.2.8-pre0.20110905">
<manifest-digest sha256="dca22a2e57e9b322440209bd67f878abfc0a812c694f2648480ee61f8591ab2a"/>
<archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110905/+download/armagetronad-alpha-dedicated-0.2.8_alpha20110905.i486-generic-linux-gnu.bin.tar.bz2" size="1106684"/>
</implementation>
</group>
+ <group arch="Linux-i486" stability="developer">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Linux-i486.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=c758d391799a9bc0aee5c7d8ffadfcc122afc7fb" main="AppRun" released="2011-09-12" version="0.2.8-pre0.20110912">
+ <manifest-digest sha256="462d460bafc60f0737755184a7179a6079f0c6438fcf467525fc2cf3406fdd00"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110912/+download/armagetronad-alpha-dedicated-0.2.8_alpha20110912.i486-generic-linux-gnu.bin.tar.bz2" size="1123938"/>
+ </implementation>
+ </group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Linux-x86_64.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -20,7 +20,9 @@
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ <implementation id="sha1new=ede4a8de81d728926856d2c8f88f6f1e001b3ae7" main="AppRun" released="2011-09-12" version="0.2.8-pre0.20110912">
+ <manifest-digest sha256="994fb5f128112909288844849780d20c83a6e483644db77b238d188de6434d65"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110912/+download/armagetronad-alpha-dedicated-0.2.8_alpha20110912.x86_64-generic-linux-gnu.bin.tar.bz2" size="1196888"/>
</implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Windows.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Windows.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-dedicated-Windows.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -20,7 +20,7 @@
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" stability="insecure" version="0-pre0-pre0">
</implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-beta-Windows.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-beta-Windows.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-beta-Windows.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -19,6 +19,6 @@
<implementation id="sha1new=6b8363c8f78c891e80c8007fa07f60d1879a68a4" released="2011-08-31" version="0.2.8.3.2-rc1">
<manifest-digest sha256="ec61c4fbb15c1a693ebeaad500fb4fc8eb49f0429b530bdd8d2f6878a4884aa0"/>
<archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2-rc1/+download/armagetronad-0.2.8.3.2_rc1-Windows.zip" size="3574789"/>
- </implementation>
+ </implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-i486.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-i486.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-i486.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -15,7 +15,7 @@
<homepage>http://armagetronad.net</homepage>
<category>Game</category>
<icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
- <group arch="Linux-i486" stability="testing">
+ <group arch="Linux-i486" stability="insecure">
<requires interface="http://simamo.de/0install/armagetronad-libs-Linux-i486.xml">
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
@@ -25,4 +25,12 @@
<archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2-rc1/+download/armagetronad-dedicated-0.2.8.3.2_rc1.i486-generic-linux-gnu.bin.tar.bz2" size="1106275"/>
</implementation>
</group>
+ <group arch="Linux-i486" stability="testing">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Linux-i486.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" stability="insecure" version="0-pre0-pre0">
+ </implementation>
+ </group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-x86_64.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-x86_64.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Linux-x86_64.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -20,7 +20,7 @@
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" stability="insecure" version="0-pre0-pre0">
</implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Windows.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Windows.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-beta-dedicated-Windows.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -20,7 +20,7 @@
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" stability="insecure" version="0-pre0-pre0">
</implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-proto-arch.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-proto-arch.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-proto-arch.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -20,7 +20,7 @@
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" stability="insecure" version="0-pre0-pre0">
</implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-stable-Linux-i486.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-stable-Linux-i486.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-stable-Linux-i486.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -19,9 +19,13 @@
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <implementation id="sha1new=dc048fe3943a02054e119d94e4b03ee5c9413bd5" main="usr/local/bin/armagetronad" released="2011-08-29" version="0.2.8.3.1">
+ <implementation id="sha1new=dc048fe3943a02054e119d94e4b03ee5c9413bd5" main="usr/local/bin/armagetronad" released="2011-08-29" stability="insecure" version="0.2.8.3.1">
<manifest-digest sha256="967443a495e4dd5814195368c653bd8c663732ebe0a3d24ae51eed816eb65ee7"/>
<archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.1/+download/armagetronad-0.2.8.3.1.i486-generic-linux-gnu.bin.tar.bz2" size="2101110"/>
</implementation>
+ <implementation id="sha1new=3da2546a4d154795a5cdb5b597f03582fa592424" main="AppRun" released="2011-09-11" version="0.2.8.3.2">
+ <manifest-digest sha256="7c86ea7baf4e54629b1fc82cecbe2c81d1c9247334e92b3e15072ea7ae44e0a3"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2/+download/armagetronad-0.2.8.3.2.i486-generic-linux-gnu.bin.tar.bz2" size="1605926"/>
+ </implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-stable-Linux-x86_64.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-stable-Linux-x86_64.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-stable-Linux-x86_64.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -20,9 +20,13 @@
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <implementation id="sha1new=254146b51108ba0dc1b2fc2c03db1b6ac9567750" main="usr/local/bin/armagetronad" released="2011-08-30" version="0.2.8.3.1">
+ <implementation id="sha1new=254146b51108ba0dc1b2fc2c03db1b6ac9567750" main="usr/local/bin/armagetronad" released="2011-08-30" stability="insecure" version="0.2.8.3.1">
<manifest-digest sha256="8cd909f092ac4e8cea318c3c22873cda45f312b2c5798d5482da7b008b463bd8"/>
<archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.1/+download/armagetronad-0.2.8.3.1.x86_64-generic-linux-gnu.bin.tar.bz2" size="1721935"/>
</implementation>
+ <implementation id="sha1new=25aca2e2157a242ba6e8b59b3bf6002a5fe1b51f" main="AppRun" released="2011-09-11" version="0.2.8.3.2">
+ <manifest-digest sha256="5b7a78b2b741edeed727a38577c32d70baa8884e984456c81d502d59ad8034f8"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2/+download/armagetronad-0.2.8.3.2.x86_64-generic-linux-gnu.bin.tar.bz2" size="1668484"/>
+ </implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-stable-Windows.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-stable-Windows.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-stable-Windows.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -16,9 +16,13 @@
<category>Game</category>
<icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
<group arch="Windows-*" doc-dir="doc" license="GPL v2 (GNU General Public License)" main="armagetronad.exe" stability="stable">
- <implementation id="sha1new=1d813001052136e3aaa7092fd6b5fd6e57c3b26a" released="2011-08-31" version="0.2.8.3.1">
+ <implementation id="sha1new=1d813001052136e3aaa7092fd6b5fd6e57c3b26a" released="2011-08-31" stability="insecure" version="0.2.8.3.1">
<manifest-digest sha256="7e3793a10bbf68bb76bacec950186099bb026b29f14d25eeb3159716e6fa9d07"/>
<archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.1/+download/armagetronad-0.2.8.3.1-Windows.zip" size="3573524"/>
</implementation>
+ <implementation id="sha1new=c555c4b882f4540f3d65b27b0f81891d30ab897c" released="2011-09-11" version="0.2.8.3.2">
+ <manifest-digest sha256="0d872320a5682dbe67961aca3211dd3c8cf8b0feaf5b23e789624f3ee530e595"/>
+ <archive extract="" href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2/+download/armagetronad-0.2.8.3.2.win32.zip" size="3673323"/>
+ </implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-i486.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-i486.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-i486.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -15,7 +15,7 @@
<homepage>http://armagetronad.net</homepage>
<category>Game</category>
<icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
- <group arch="Linux-i486" stability="stable">
+ <group arch="Linux-i486" stability="insecure">
<requires interface="http://simamo.de/0install/armagetronad-libs-Linux-i486.xml">
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
@@ -25,4 +25,14 @@
<archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.1/+download/armagetronad-dedicated-0.2.8.3.1.i486-generic-linux-gnu.bin.tar.bz2" size="1106581"/>
</implementation>
</group>
+ <group arch="Linux-i486" stability="stable">
+ <requires interface="http://simamo.de/0install/armagetronad-libs-Linux-i486.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation id="sha1new=0297685d56a4ec6bf6ab5669e284d3a6c2f133ee" main="AppRun" released="2011-09-11" version="0.2.8.3.2">
+ <manifest-digest sha256="3323a0890bfafe372a93bb4c5ab55441ceaf45995b111b3f726eff55450fa59f"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2/+download/armagetronad-dedicated-0.2.8.3.2.i486-generic-linux-gnu.bin.tar.bz2" size="1108087"/>
+ </implementation>
+ </group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-x86_64.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-x86_64.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Linux-x86_64.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -20,7 +20,9 @@
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ <implementation id="sha1new=5ee6acc99ce5c80efc49348b557402ae4aef2cf1" main="AppRun" released="2011-09-11" version="0.2.8.3.2">
+ <manifest-digest sha256="1c4f33fac238dbffc9cd90d30a67fb169839e7f6d66ec0a2353db586f807f82e"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2/+download/armagetronad-dedicated-0.2.8.3.2.x86_64-generic-linux-gnu.bin.tar.bz2" size="1174300"/>
</implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Windows.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Windows.xml 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/0install/armagetronad-stable-dedicated-Windows.xml 2011-09-12 10:38:15 UTC (rev 9929)
@@ -20,7 +20,7 @@
<version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
<environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" version="0-pre0-pre0">
+ <implementation id="sha1new=aaaac42323a6d6a85ea9f3c1550f8c8be06d90ae" released="2011-08-29" stability="insecure" version="0-pre0-pre0">
</implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-12 10:01:05 UTC (rev 9928)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-12 10:38:15 UTC (rev 9929)
@@ -698,7 +698,7 @@
#
cp doc/releasenotes.txt $(UPLOAD)/
head -n 1000 $(SOURCEDIR)/ChangeLog > $(UPLOAD)/ChangeLog
- cd ${UPLOAD}; ../../../../scripts/lp-upload armagetronad "$(SERIES)" "$(VERSION)" *.gz *.bz2 *.zip *.deb *.package *.rpm *.exe *.dmg $(PORTABLE_CLIENT_NAME)_*
+ cd ${UPLOAD}; ../../../../scripts/lp-upload armagetronad "$(SERIES)" "$(VERSION)" *.gz *.bz2 *.zip *.deb *.package *.rpm *.exe *.dmg $(PORTABLE_CLIENT_NAME)*
# cd ${UPLOAD}; PROJ=armagetron-builds; test $(PACKAGE) = armagetronad && PROJ=armagetronad; ../../../../scripts/lp-upload "$$PROJ" "$(SERIES)" "$(VERSION)" *.gz *.bz2 *.zip *.deb *.package *.rpm *.exe *.dmg
upload-sf: uploadcheck upload-rename
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-13 09:28:51
|
Revision: 9933
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9933&view=rev
Author: z-man
Date: 2011-09-13 09:28:40 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9928 to 9932:
------------------------------------------------------------------------
r9932 | bazaaarmagetron | 2011-09-12 19:36:03 +0200 (Mon, 12 Sep 2011) | 2 lines
Manuel Moos: Omitting extra library inclusion on dedicated server, it's not needed.
------------------------------------------------------------------------
r9930 | bazaaarmagetron | 2011-09-12 12:40:49 +0200 (Mon, 12 Sep 2011) | 1 line
Manuel Moos: Updating zeroinstall streams to version 0.2.8_alpha20110912
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9928&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9932&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9930&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/0install/armagetronad-alpha-Windows.xml
armagetronad/trunk/build/portable/build
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9928
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9932
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/build/0install/armagetronad-alpha-Windows.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha-Windows.xml 2011-09-12 17:36:03 UTC (rev 9932)
+++ armagetronad/trunk/build/0install/armagetronad-alpha-Windows.xml 2011-09-13 09:28:40 UTC (rev 9933)
@@ -19,6 +19,10 @@
<implementation id="sha1new=04141e3613cd1e889dd78260325cd71c88a33ee0" released="2011-08-31" version="0.2.8-pre0.20110829">
<manifest-digest sha256="3b76f23c8bf5adc741db59210d2e92800ce200687d24b7baa3cc4ee6e0891872"/>
<archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110829/+download/armagetronad-0.2.8_alpha20110829-Windows.zip" size="3480154"/>
+ </implementation>
+ <implementation id="sha1new=9df85333252595e40a407e57e5514911ba85f8c2" released="2011-09-12" version="0.2.8-pre0.20110912">
+ <manifest-digest sha256="65703ed8197e6ab56785e7c8815c1af732d66e1cf09bf7e80c505bb0cfaf17c2"/>
+ <archive extract="" href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110912/+download/armagetronad-alpha-0.2.8_alpha20110912.win32.zip" size="3578642"/>
</implementation>
</group>
</interface>
Modified: armagetronad/trunk/build/portable/build
===================================================================
--- armagetronad/trunk/build/portable/build 2011-09-12 17:36:03 UTC (rev 9932)
+++ armagetronad/trunk/build/portable/build 2011-09-13 09:28:40 UTC (rev 9933)
@@ -60,6 +60,7 @@
fi
done
+if ! echo ${PACKAGE} grep dedicated; then
# libraries we know are dynamically loaded later, so they don't appear in ldd's output
for library in \
libjpeg.so.62 \
@@ -76,6 +77,6 @@
echo "Installing library ${library} anyway, we know it's needed."
copylib ${lastpath}/${library}
done
+fi
-
echo $lastpath
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-13 11:41:38
|
Revision: 9936
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9936&view=rev
Author: z-man
Date: 2011-09-13 11:41:28 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9932 to 9935:
------------------------------------------------------------------------
r9935 | bazaaarmagetron | 2011-09-13 13:22:38 +0200 (Tue, 13 Sep 2011) | 2 lines
Manuel Moos: Externalized zeroinstall streams. No trunk/0.2.8 distinction for now, trunk works for both.
------------------------------------------------------------------------
r9934 | bazaaarmagetron | 2011-09-13 13:22:07 +0200 (Tue, 13 Sep 2011) | 2 lines
Manuel Moos: Signatures now go into the signatures subdirectory. Less confusion.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9932&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9935&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9934&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/.bzrignore
armagetronad/trunk/build/WorkMakefile
armagetronad/trunk/build/scripts/lp-upload
Removed Paths:
-------------
armagetronad/trunk/build/0install/
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9932
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9935
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/build/.bzrignore
===================================================================
--- armagetronad/trunk/build/.bzrignore 2011-09-13 11:22:38 UTC (rev 9935)
+++ armagetronad/trunk/build/.bzrignore 2011-09-13 11:41:28 UTC (rev 9936)
@@ -3,6 +3,5 @@
./builds
./ap-client
./make.conf.bak
-*.gpg
-interface.xsl
+0install
Upload
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-13 11:22:38 UTC (rev 9935)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-13 11:41:28 UTC (rev 9936)
@@ -659,8 +659,16 @@
binary_tarball: binary_client_tarball binary_server_tarball
+0install:
+ #
+ # *****************************************
+ # * checking out zeroinstall streams
+ # *****************************************
+ #
+ bzr branch bzr+ssh://bazaar.launchpad.net/~armagetronad-dev/armagetronad/trunk-zeroinstall-work $@
+
zeroinstall: uploadcheck $(ZEROINSTTAG)
-$(ZEROINSTTAG): $(BINARY_CLIENT_TARBALL) $(BINARY_SERVER_TARBALL) 0install/update
+$(ZEROINSTTAG): $(BINARY_CLIENT_TARBALL) $(BINARY_SERVER_TARBALL) 0install 0install/update
#
# *****************************************
# * update zeroinstall stream
Modified: armagetronad/trunk/build/scripts/lp-upload
===================================================================
--- armagetronad/trunk/build/scripts/lp-upload 2011-09-13 11:22:38 UTC (rev 9935)
+++ armagetronad/trunk/build/scripts/lp-upload 2011-09-13 11:41:28 UTC (rev 9936)
@@ -80,12 +80,12 @@
def prepare_file( filename ):
# Get the signature, if available.
- signature = filename + '.asc'
+ signature = 'signatures/ ' + filename + '.asc'
if not os.path.exists(signature):
print 'Calling GPG to create ' + filename + ' signature...'
- if subprocess.call(['gpg', '--armor', '--sign', '--detach-sig', filename]) != 0:
+ if subprocess.call(['gpg', '--armor', '--sign', '--output', signature, '--detach-sig', filename]) != 0:
print >> sys.stderr, 'gpg failed, aborting'
-
+
def upload_file( filename, description, mime_type, file_type ):
# Get the file contents.
file_content = open(filename, 'r').read()
@@ -96,7 +96,7 @@
print "Already exists, delete it first if you want to re-upload it."
return
- signature = filename + '.asc'
+ signature = 'signatures/ ' + filename + '.asc'
if os.path.exists(signature):
signature_content = open(signature, 'r').read()
@@ -119,6 +119,8 @@
sys.exit(2)
try:
+ if not os.path.exists("signatures"):
+ os.makedirs("signatures")
uploads=[]
for f in builds:
if os.path.exists(f) and os.path.splitext(f)[1] != ".asc":
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-18 22:56:26
|
Revision: 9945
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9945&view=rev
Author: z-man
Date: 2011-09-18 22:56:19 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9935 to 9944:
------------------------------------------------------------------------
r9944 | bazaaarmagetron | 2011-09-18 21:12:42 +0200 (Sun, 18 Sep 2011) | 2 lines
Manuel Moos: New ladderlog messages for team management (creation, destruction, renames, players added and removed)
------------------------------------------------------------------------
r9943 | bazaaarmagetron | 2011-09-16 17:58:18 +0200 (Fri, 16 Sep 2011) | 2 lines
Manuel Moos: BAN_IP now kicks all players from that IP.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9935&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9944&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9943&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/NEWS
armagetronad/trunk/armagetronad/language/english_base.txt
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
armagetronad/trunk/armagetronad/src/engine/eTeam.cpp
armagetronad/trunk/armagetronad/src/engine/eTeam.h
armagetronad/trunk/armagetronad/src/network/nNetwork.cpp
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9935
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9944
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/armagetronad/NEWS
===================================================================
--- armagetronad/trunk/armagetronad/NEWS 2011-09-18 19:12:42 UTC (rev 9944)
+++ armagetronad/trunk/armagetronad/NEWS 2011-09-18 22:56:19 UTC (rev 9945)
@@ -125,6 +125,12 @@
- Added ENCODING ladderlog event, which specifies the encoding for data in
ladderlog.txt.
- "--input" now can be used more than once to read from multiple files or pipes.
+- new team management ladderlog messages:
+ TEAM_CREATED <team name>
+ TEAM_DESTROYED <team name>
+ TEAM_RENAMED <old team name> <new team name>
+ TEAM_PLAYER_ADDED <team name> <player>
+ TEAM_PLAYER_REMOVED <team name> <player>
Changes since 0.2.8.3.1:
- security fix: old style action commands from clients no loger cause hangs and crashes
Modified: armagetronad/trunk/armagetronad/language/english_base.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/english_base.txt 2011-09-18 19:12:42 UTC (rev 9944)
+++ armagetronad/trunk/armagetronad/language/english_base.txt 2011-09-18 22:56:19 UTC (rev 9945)
@@ -831,6 +831,11 @@
ladderlog_write_round_winner_help Write to ladderlog: ROUND_WINNER <team> <players>
ladderlog_write_sacrifice_help Write to ladderlog: SACRIFICE <player who used the hole> <player who created the hole> <player owning the wall the hole was made into>
ladderlog_write_wait_for_external_script_help Write to ladderlog: WAIT_FOR_EXTERNAL_SCRIPT (see also: WAIT_FOR_EXTERNAL_SCRIPT and WAIT_FOR_EXTERNAL_SCRIPT_TIMEOUT)
+ladderlog_write_team_created_help Write to ladderlog: TEAM_CREATED <team name>
+ladderlog_write_team_destroyed_help Write to ladderlog: TEAM_DESTROYED <team name>
+ladderlog_write_team_renamed_help Write to ladderlog: TEAM_RENAMED <old team name> <new team name>
+ladderlog_write_team_player_added_help Write to ladderlog: TEAM_PLAYER_ADDED <team name> <player>
+ladderlog_write_team_player_removed_help Write to ladderlog: TEAM_PLAYER_REMOVED <team name> <player>
ladderlog_game_time_interval_help If non-negative, write a line with the current game time to the ladder log every n seconds.
chat_log_help Write machine parsable chat messages to var/chatlog.txt
show_fps_help Enable fps display
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2011-09-18 19:12:42 UTC (rev 9944)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2011-09-18 22:56:19 UTC (rev 9945)
@@ -4986,6 +4986,8 @@
// log scores
LogScoreDifference();
+ bool logLeave = false;
+
if ( sn_GetNetState() != nCLIENT )
{
nameFromClient_ = nameFromServer_;
@@ -5006,9 +5008,7 @@
if ( IsHuman() && sn_GetNetState() == nSERVER && NULL != sn_Connections[Owner()].socket )
{
- tString ladder;
- se_playerLeftWriter << userName_ << nMachine::GetMachine(Owner()).GetIP();
- se_playerLeftWriter.write();
+ logLeave = true;
tString notificationMessage(userName_);
notificationMessage << " left the grid";
se_sendEventNotification(tString("Player left"), notificationMessage);
@@ -5025,7 +5025,12 @@
SetTeam( NULL );
UpdateTeam();
ControlObject( NULL );
- // currentTeam = NULL;
+
+ if( logLeave )
+ {
+ se_playerLeftWriter << userName_ << nMachine::GetMachine(Owner()).GetIP();
+ se_playerLeftWriter.write();
+ }
}
bool ePlayerNetID::ActionOnQuit()
Modified: armagetronad/trunk/armagetronad/src/engine/eTeam.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/eTeam.cpp 2011-09-18 19:12:42 UTC (rev 9944)
+++ armagetronad/trunk/armagetronad/src/engine/eTeam.cpp 2011-09-18 22:56:19 UTC (rev 9945)
@@ -224,10 +224,18 @@
RequestSync();
}
+static eLadderLogWriter se_teamRenamedWriter("TEAM_RENAMED", true);
+static eLadderLogWriter se_teamCreateWriter("TEAM_CREATED", true);
+static eLadderLogWriter se_teamDestroyWriter("TEAM_DESTROYED", true);
+static eLadderLogWriter se_teamAddWriter("TEAM_PLAYER_ADDED", true);
+static eLadderLogWriter se_teamRemoveWriter("TEAM_PLAYER_REMOVED", true);
+
// update name and color
void eTeam::UpdateAppearance()
{
tShortColor oldColor( color );
+ bool empty = false;
+ tString oldName = name;
ePlayerNetID* oldest = OldestHumanPlayer();
if ( !oldest )
@@ -335,7 +343,30 @@
// empty team
updateName = tOutput("$team_empty");
color.r_ = color.g_ = color.b_ = 7;
+ empty = true;
}
+
+ tString oldNameFiltered = ePlayerNetID::FilterName(oldName);
+ tString newNameFiltered = ePlayerNetID::FilterName(name);
+ if( oldNameFiltered != newNameFiltered )
+ {
+ if( !empty && !lastEmpty_ )
+ {
+ se_teamRenamedWriter << oldNameFiltered << newNameFiltered;
+ se_teamRenamedWriter.write();
+ }
+ else if( !empty )
+ {
+ se_teamCreateWriter << newNameFiltered;
+ se_teamCreateWriter.write();
+ }
+ else if( !lastEmpty_ )
+ {
+ se_teamDestroyWriter << oldNameFiltered;
+ se_teamDestroyWriter.write();
+ }
+ }
+ lastEmpty_ = empty;
// if the name has been changed then update it
if (name!=updateName)
@@ -1079,6 +1110,10 @@
*/
}
+
+ se_teamAddWriter << ePlayerNetID::FilterName( name ) << player->GetLogName();
+ se_teamAddWriter.write();
+
// anounce joining if there are is more than one member now or if the team is color-named
if ( sn_GetNetState() != nCLIENT )
{
@@ -1148,6 +1183,9 @@
}
player->UpdateName();
+
+ se_teamAddWriter << ePlayerNetID::FilterName( name ) << player->GetLogName();
+ se_teamAddWriter.write();
}
// deregister a player
@@ -1170,11 +1208,17 @@
players.Remove ( player, player->teamListID );
player->currentTeam = NULL;
+ se_teamRemoveWriter << ePlayerNetID::FilterName( name ) << player->GetLogName();
+ se_teamRemoveWriter.write();
+
// remove team from list
if ( listID >= 0 && players.Len() == 0 )
{
teams.Remove( this, listID );
+ // correctly log removal
+ UpdateAppearance();
+
// don't forget the colored team list
if ( colorID >= 0 )
{
@@ -1552,6 +1596,7 @@
maxPlayersLocal = maxPlayers;
maxImbalanceLocal = maxImbalance;
color.r_ = color.g_ = color.b_ = 32; // initialize color so it will be updated, guaranteed
+ lastEmpty_=true;
Update();
}
@@ -1567,12 +1612,16 @@
maxPlayersLocal = maxPlayers;
maxImbalanceLocal = maxImbalance;
color.r_ = color.g_ = color.b_ = 32; // initialize color so it will be updated, guaranteed
+ lastEmpty_=true;
Update();
}
// destructor
eTeam::~eTeam()
{
+ // one last time
+ UpdateAppearance();
+
if ( listID >= 0 )
teams.Remove( this, listID );
Modified: armagetronad/trunk/armagetronad/src/engine/eTeam.h
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/eTeam.h 2011-09-18 19:12:42 UTC (rev 9944)
+++ armagetronad/trunk/armagetronad/src/engine/eTeam.h 2011-09-18 22:56:19 UTC (rev 9945)
@@ -48,6 +48,8 @@
int score; // score the team has accumulated
int lastScore_; //!< score from the beginning of the round
+ bool lastEmpty_; //!< flag indicating whether the team was empty on the last call to UpdateAppearance
+
int numHumans; // number of human players on the team
int numAIs; // number of AI players on the team
Modified: armagetronad/trunk/armagetronad/src/network/nNetwork.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2011-09-18 19:12:42 UTC (rev 9944)
+++ armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2011-09-18 22:56:19 UTC (rev 9945)
@@ -4920,6 +4920,18 @@
// set the banning timeout to the current time plus the given time
banned_ = tSysTimeFloat() + time;
+ // kick current clients
+ if( time > 0 )
+ {
+ for( int i = MAXCLIENTS-1; i > 0; --i )
+ {
+ if ( sn_Connections[i].socket && &GetMachine(i) == this )
+ {
+ sn_DisconnectUser( i, banReason_ );
+ }
+ }
+ }
+
if ( sn_printBans )
{
if ( time > 0 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-19 10:20:17
|
Revision: 9950
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9950&view=rev
Author: z-man
Date: 2011-09-19 10:20:11 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9944 to 9949:
------------------------------------------------------------------------
r9949 | bazaaarmagetron | 2011-09-19 11:49:10 +0200 (Mon, 19 Sep 2011) | 2 lines
Manuel Moos: Removing patch that is no longer needed.
------------------------------------------------------------------------
r9948 | bazaaarmagetron | 2011-09-19 11:44:01 +0200 (Mon, 19 Sep 2011) | 2 lines
Manuel Moos: Setting push default for 0install branch.
------------------------------------------------------------------------
r9947 | bazaaarmagetron | 2011-09-19 11:31:42 +0200 (Mon, 19 Sep 2011) | 2 lines
Manuel Moos: Removing 0install subdirectory before branching it.
------------------------------------------------------------------------
r9946 | bazaaarmagetron | 2011-09-19 11:22:58 +0200 (Mon, 19 Sep 2011) | 2 lines
Manuel Moos: Adding 0install/update target
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9944&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9949&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9948&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9947&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9946&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/WorkMakefile
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9944
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9949
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-19 09:49:10 UTC (rev 9949)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-19 10:20:11 UTC (rev 9950)
@@ -383,8 +383,8 @@
# adapt the following line as ubuntu releases get updated
bzr pull -d ../ubuntu || HOME=/noway bzr branch lp:ubuntu/armagetronad ../ubuntu
cp -ax ../ubuntu/debian $(UBUNTUSOURCEDIR)$*/debian
-# don't even generate uninstall.
- patch -p0 -d $(UBUNTUSOURCEDIR)$* < patches/ubuntu.patch
+# applied on the branch we check out, no longer required
+# patch -p0 -d $(UBUNTUSOURCEDIR)$* < patches/ubuntu.patch
# Fixes var dir location of dedicated server.
patch -p0 -d $(UBUNTUSOURCEDIR)$* < patches/ubuntu-vardir.patch
# Updates dependencies
@@ -665,8 +665,12 @@
# * checking out zeroinstall streams
# *****************************************
#
+ rm -rf $@
bzr branch bzr+ssh://bazaar.launchpad.net/~armagetronad-dev/armagetronad/trunk-zeroinstall-work $@
+ cd $@; bzr push bzr+ssh://bazaar.launchpad.net/~armagetronad-dev/armagetronad/trunk-zeroinstall-work
+0install/update: 0install
+
zeroinstall: uploadcheck $(ZEROINSTTAG)
$(ZEROINSTTAG): $(BINARY_CLIENT_TARBALL) $(BINARY_SERVER_TARBALL) 0install 0install/update
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-20 14:42:05
|
Revision: 9963
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9963&view=rev
Author: z-man
Date: 2011-09-20 14:41:55 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9958 to 9962:
------------------------------------------------------------------------
r9962 | bazaaarmagetron | 2011-09-20 16:35:03 +0200 (Tue, 20 Sep 2011) | 2 lines
Manuel Moos: Proper location for hack snapshots.
------------------------------------------------------------------------
r9961 | bazaaarmagetron | 2011-09-20 16:34:38 +0200 (Tue, 20 Sep 2011) | 2 lines
Manuel Moos: upload-sf now uploads directly to a sensible place
------------------------------------------------------------------------
r9960 | bazaaarmagetron | 2011-09-19 20:16:16 +0200 (Mon, 19 Sep 2011) | 2 lines
Manuel Moos: Replacing ~rc with ~arc in debian version so it can get superseeded by ~ppa later.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9958&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9962&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9961&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9960&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/WorkMakefile
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9958
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9962
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-20 14:35:03 UTC (rev 9962)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-20 14:41:55 UTC (rev 9963)
@@ -367,7 +367,7 @@
find $(RCDIR) -name "$(PACKAGE)*.deb" -exec mv \{\} $(UPLOAD) \;
-DEBVERSION=$(subst _,~,${VERSION})~ppa
+DEBVERSION=$(subst -,~,$(subst _,~,$(subst _rc,_arc,${VERSION})))~ppa
UBUNTUSOURCEDIR=$(RCDIR)/$(PACKAGE)-$(DEBVERSION)
$(UBUNTUSOURCEDIR)%.tag: $(INPUTTARBALLBASE) $(UPLOAD)/.tag
#
@@ -671,6 +671,9 @@
0install/update: 0install
+# sf upload subdirectory
+SF_DIRECTORY=$(shell echo "$(SERIES)" | sed -e 's,^0.2.8$$,stable,' -e 's,^\(.*\)-snapshots,snapshots/\1,' -e 's,^hacks$$,snapshots/hacks,')
+
zeroinstall: uploadcheck $(ZEROINSTTAG)
$(ZEROINSTTAG): $(BINARY_CLIENT_TARBALL) $(BINARY_SERVER_TARBALL) 0install 0install/update
#
@@ -678,8 +681,8 @@
# * update zeroinstall stream
# *****************************************
#
- OSTAG_GENERIC=${OSTAG_GENERIC} PACKAGE=${PACKAGE} SERIES=${SERIES} FILE=${BINARY_CLIENT_TARBALL} VERSION=${VERSION} 0install/update
- OSTAG_GENERIC=${OSTAG_GENERIC} PACKAGE=${PACKAGE}-dedicated SERIES=${SERIES} FILE=${BINARY_SERVER_TARBALL} VERSION=${VERSION} 0install/update
+ SF_DIRECTORY=$(SF_DIRECTORY) OSTAG_GENERIC=${OSTAG_GENERIC} PACKAGE=${PACKAGE} SERIES=${SERIES} FILE=${BINARY_CLIENT_TARBALL} VERSION=${VERSION} 0install/update
+ SF_DIRECTORY=$(SF_DIRECTORY) OSTAG_GENERIC=${OSTAG_GENERIC} PACKAGE=${PACKAGE}-dedicated SERIES=${SERIES} FILE=${BINARY_SERVER_TARBALL} VERSION=${VERSION} 0install/update
touch $@
APFILE=$(RCDIR)/.package
@@ -720,10 +723,9 @@
# * uploading compiled files to sf *
# *****************************************
#
-
cp doc/releasenotes.txt $(UPLOAD)/
todos $(UPLOAD)/releasenotes.txt
- cd ${UPLOAD}; mkdir -p new/$(VERSION); rsync -avP -e ssh new z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/; rmdir new/$(VERSION); rmdir new; rsync -avP -e ssh * z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/new/$(VERSION)/
+ cd ${UPLOAD}; mkdir -p armagetronad/$(SF_DIRECTORY)/$(VERSION); rsync -r -e ssh armagetronad z-man,arm...@fr...:/home/frs/project/a/ar/; rm -rf armagetronad; rsync -avP -e ssh * z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/$(SF_DIRECTORY)/$(VERSION)/
TOEMPTYLINE=sed -e "s,^$$,," -e "t q" -e "p" -e "d" -e ": q" -e "q"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-21 16:47:30
|
Revision: 9967
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9967&view=rev
Author: z-man
Date: 2011-09-21 16:47:24 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9962 to 9966:
------------------------------------------------------------------------
r9966 | bazaaarmagetron | 2011-09-21 18:35:15 +0200 (Wed, 21 Sep 2011) | 2 lines
Manuel Moos: Binary tarballs now come with 'run' as main launch script instead of 'AppRun'.
------------------------------------------------------------------------
r9965 | bazaaarmagetron | 2011-09-21 14:58:04 +0200 (Wed, 21 Sep 2011) | 2 lines
Manuel Moos: Putting snapshot uploads into yearly subdirectories.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9962&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9966&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9965&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/WorkMakefile
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9962
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9966
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-21 16:35:15 UTC (rev 9966)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-21 16:47:24 UTC (rev 9967)
@@ -593,7 +593,7 @@
for f in language resource scripts; do mv ${CLIENT_TARBALL_DIR}/data/$$f ${CLIENT_TARBALL_DIR}/main/usr/local/share/games/${PACKAGE}/; done
# copy AppRun
- cp portable/AppRun ${CLIENT_TARBALL_DIR}/main/
+ cp portable/AppRun ${CLIENT_TARBALL_DIR}/main/run
cp ${APPDIR_CLIENT}/*.desktop ${CLIENT_TARBALL_DIR}/main/
# tag
@@ -644,7 +644,7 @@
${MAKE} -C ${GENERIC_SERVER_DIR} DESTDIR=$$(pwd)/${SERVER_TARBALL_DIR} install
# copy AppRun
- cp portable/AppRun ${SERVER_TARBALL_DIR}/
+ cp portable/AppRun ${SERVER_TARBALL_DIR}/run
find ${SERVER_TARBALL_DIR} -type f -name "*.desktop" -exec mv \{\} ${SERVER_TARBALL_DIR}/ \;
APPDIR=${SERVER_TARBALL_DIR} portable/fixlinks
@@ -668,8 +668,13 @@
0install/update: 0install
# sf upload subdirectory
-SF_DIRECTORY=$(shell echo "$(SERIES)" | sed -e 's,^0.2.8$$,stable,' -e 's,^\(.*\)-snapshots,snapshots/\1,' -e 's,^hacks$$,snapshots/hacks,')
+# get a stable year tag
+$(UPLOAD).datetag:
+ date +BUILDYEAR=%Y > $@
+sinclude $(UPLOAD).datetag
+SF_DIRECTORY=$(shell echo "$(SERIES)" | sed -e 's,^0.2.8$$,stable,' -e 's,^\(.*\)-snapshots,snapshots/\1,' -e 's,^hacks$$,snapshots/hacks,' -e 's,\(snapshots.*\),\1/$(BUILDYEAR),')
+
zeroinstall: uploadcheck $(ZEROINSTTAG)
$(ZEROINSTTAG): $(BINARY_CLIENT_TARBALL) $(BINARY_SERVER_TARBALL) 0install 0install/update
#
@@ -719,6 +724,7 @@
# * uploading compiled files to sf *
# *****************************************
#
+ #echo $(SF_DIRECTORY); false
cp doc/releasenotes.txt $(UPLOAD)/
todos $(UPLOAD)/releasenotes.txt
cd ${UPLOAD}; mkdir -p armagetronad/$(SF_DIRECTORY)/$(VERSION); rsync -r -e ssh armagetronad z-man,arm...@fr...:/home/frs/project/a/ar/; rm -rf armagetronad; rsync -avP -e ssh * z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/$(SF_DIRECTORY)/$(VERSION)/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-22 00:01:05
|
Revision: 9977
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9977&view=rev
Author: z-man
Date: 2011-09-22 00:00:58 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9966 to 9976:
------------------------------------------------------------------------
r9976 | bazaaarmagetron | 2011-09-22 00:54:56 +0200 (Thu, 22 Sep 2011) | 2 lines
Manuel Moos: Dividing Windows zip in main and library part.
------------------------------------------------------------------------
r9974 | bazaaarmagetron | 2011-09-21 22:50:40 +0200 (Wed, 21 Sep 2011) | 2 lines
Manuel Moos: Added winbin target for Windows builds using Wine.
------------------------------------------------------------------------
r9973 | bazaaarmagetron | 2011-09-21 22:50:13 +0200 (Wed, 21 Sep 2011) | 2 lines
Manuel Moos: Adaptions to Wineification of makedist.bat
------------------------------------------------------------------------
r9972 | bazaaarmagetron | 2011-09-21 22:37:00 +0200 (Wed, 21 Sep 2011) | 4 lines
author: Manuel Moos
Adding batch file for Windows builds from Linux.
Uses library move hacks so it works with Code::Blocks 10.04.
------------------------------------------------------------------------
r9971 | bazaaarmagetron | 2011-09-21 22:36:37 +0200 (Wed, 21 Sep 2011) | 2 lines
Manuel Moos: Making compatible with wine cmd interpreter.
------------------------------------------------------------------------
r9970 | z-man | 2011-09-21 22:31:57 +0200 (Wed, 21 Sep 2011) | 2 lines
Making compatible with wine cmd.
------------------------------------------------------------------------
r9969 | bazaaarmagetron | 2011-09-21 21:17:14 +0200 (Wed, 21 Sep 2011) | 2 lines
Manuel Moos: Unifying configurations: Win32 Debug/Release.
------------------------------------------------------------------------
r9968 | bazaaarmagetron | 2011-09-21 21:12:52 +0200 (Wed, 21 Sep 2011) | 2 lines
Manuel Moos: Compatibility with current code::blocks and mingw, old 1.0-rc2 still working.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9966&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9976&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9974&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9973&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9972&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9971&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9970&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9969&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9968&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/win32/config_common.h
armagetronad/trunk/build/scripts/handledist
armagetronad/trunk/build/scripts/winsrc
armagetronad/trunk/build_visualc/makedist.bat
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9966
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9976
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/armagetronad/src/win32/config_common.h
===================================================================
--- armagetronad/trunk/armagetronad/src/win32/config_common.h 2011-09-21 22:54:56 UTC (rev 9976)
+++ armagetronad/trunk/armagetronad/src/win32/config_common.h 2011-09-22 00:00:58 UTC (rev 9977)
@@ -8,9 +8,6 @@
// for visual studio 2005: use secure template overloads of strcopy and the like
#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
-// is now defined for code::blocks > 8 or so
-#define HAVE_ISBLANK
-
// this one is included in winlibs as static library
#define HAVE_LIBBOOST_THREAD
#define BOOST_THREAD_USE_LIB
@@ -34,6 +31,11 @@
// disable POD initialization behavior change warning in VisualC++ 2005
#pragma warning ( disable: 4345 )
+// compatibility with later mingw versions
+#if defined(__GNUC__) && __GNUC__ >= 4
+#define HAVE_ISBLANK
+#endif
+
// Define if this is a Windows OS.
#ifndef WIN32
#define WIN32
Modified: armagetronad/trunk/build/scripts/handledist
===================================================================
--- armagetronad/trunk/build/scripts/handledist 2011-09-21 22:54:56 UTC (rev 9976)
+++ armagetronad/trunk/build/scripts/handledist 2011-09-22 00:00:58 UTC (rev 9977)
@@ -4,6 +4,7 @@
set -x
cd ${RCDIR}
+test -d windist && mv windist windist.back
cp -ax Upload/dist windist
pushd Upload/dist
@@ -19,6 +20,9 @@
# zip up
rm -f *_dedicated.exe
rm -f *_master.exe
+rm -f *.a *.def
+zip -r ../../${PACKAGE}-libs-${VERSION}.win32.zip *.dll || exit 1
+rm -f *.dll
zip -r ../${PACKAGE}-${VERSION}.win32.zip * || exit 1
popd
Modified: armagetronad/trunk/build/scripts/winsrc
===================================================================
--- armagetronad/trunk/build/scripts/winsrc 2011-09-21 22:54:56 UTC (rev 9976)
+++ armagetronad/trunk/build/scripts/winsrc 2011-09-22 00:00:58 UTC (rev 9977)
@@ -77,7 +77,7 @@
done
rm -rf $WINDIR/config.* $WINDIR/configure* $WINDIR/*.m4 $WINDIR/*.kde*
-rm -rf $WINDIR/*.sh $WINDIR/batch $WINDIR/missing $WINDIR/install-sh $WINDIR/textures/KGN*
+rm -rf $WINDIR/bootstrap.sh $WINDIR/batch $WINDIR/missing $WINDIR/install-sh $WINDIR/textures/KGN*
find $WINDIR -name "*.in" -exec rm \{\} \;
find $WINDIR -name "*.am" -exec rm \{\} \;
find $WINDIR -name "Makefile*" -exec rm \{\} \;
Modified: armagetronad/trunk/build_visualc/makedist.bat
===================================================================
--- armagetronad/trunk/build_visualc/makedist.bat 2011-09-21 22:54:56 UTC (rev 9976)
+++ armagetronad/trunk/build_visualc/makedist.bat 2011-09-22 00:00:58 UTC (rev 9977)
@@ -2,12 +2,12 @@
REM This batch file can be used to build the target directories "dist" and "debug" one layer
REM up from here where the release and debug binaries will be compiled to.
-SET AA_DIR="..\armagetronad"
-SET LIBS_DIR="..\winlibs"
-SET DIST_DIR_BASE="dist"
-SET DEBUG_DIR_BASE="debug"
-SET DIST_DIR="..\%DIST_DIR_BASE%"
-SET DEBUG_DIR="..\%DEBUG_DIR_BASE%"
+SET AA_DIR=..\armagetronad
+SET LIBS_DIR=..\winlibs
+SET DIST_DIR_BASE=dist
+SET DEBUG_DIR_BASE=debug
+SET DIST_DIR=..\%DIST_DIR_BASE%
+SET DEBUG_DIR=..\%DEBUG_DIR_BASE%
echo making directory...
REM del %DIST_DIR% /S /Q
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-22 09:15:05
|
Revision: 9979
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9979&view=rev
Author: z-man
Date: 2011-09-22 09:14:59 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9976 to 9978:
------------------------------------------------------------------------
r9978 | bazaaarmagetron | 2011-09-22 11:10:22 +0200 (Thu, 22 Sep 2011) | 2 lines
Manuel Moos: Zipping up dedicated server as well.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9976&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9978&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/scripts/handledist
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9976
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9978
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/build/scripts/handledist
===================================================================
--- armagetronad/trunk/build/scripts/handledist 2011-09-22 09:10:22 UTC (rev 9978)
+++ armagetronad/trunk/build/scripts/handledist 2011-09-22 09:14:59 UTC (rev 9979)
@@ -18,12 +18,14 @@
rm -f *.nsi
# zip up
-rm -f *_dedicated.exe
+#rm -f *_dedicated.exe
rm -f *_master.exe
-rm -f *.a *.def
+rm -f *.a *.def banner.bmp var
zip -r ../../${PACKAGE}-libs-${VERSION}.win32.zip *.dll || exit 1
rm -f *.dll
-zip -r ../${PACKAGE}-${VERSION}.win32.zip * || exit 1
+zip -r ../${PACKAGE}-${VERSION}.win32.zip * -x *_dedicated.exe || exit 1
+rm -rf textures models sound music
+zip -r ../${PACKAGE}-dedicated-${VERSION}.win32.zip * -x armagetronad.exe ArmagetronAd.exe || exit 1
popd
# discard garbage
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-23 21:30:27
|
Revision: 9987
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9987&view=rev
Author: z-man
Date: 2011-09-23 21:30:21 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9978 to 9986:
------------------------------------------------------------------------
r9986 | bazaaarmagetron | 2011-09-23 23:03:25 +0200 (Fri, 23 Sep 2011) | 2 lines
Manuel Moos: Clean exit exception added. Thought I'd need it for the previous commit, but didn't.
------------------------------------------------------------------------
r9985 | bazaaarmagetron | 2011-09-23 23:02:44 +0200 (Fri, 23 Sep 2011) | 2 lines
Manuel Moos: armagetronad --version no longer returns an error code.
------------------------------------------------------------------------
r9984 | bazaaarmagetron | 2011-09-23 16:14:02 +0200 (Fri, 23 Sep 2011) | 2 lines
Manuel Moos: Removing spurious space in filenames.
------------------------------------------------------------------------
r9983 | bazaaarmagetron | 2011-09-23 16:13:35 +0200 (Fri, 23 Sep 2011) | 2 lines
Manuel Moos: Fixing silly mistake leading to libpng not being included
------------------------------------------------------------------------
r9982 | bazaaarmagetron | 2011-09-22 20:22:05 +0200 (Thu, 22 Sep 2011) | 2 lines
Manuel Moos: Removing dependency of sourcedir on tags.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9978&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9986&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9985&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9984&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9983&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9982&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/tools/tCommandLine.cpp
armagetronad/trunk/armagetronad/src/tools/tException.cpp
armagetronad/trunk/armagetronad/src/tools/tException.h
armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp
armagetronad/trunk/build/WorkMakefile
armagetronad/trunk/build/portable/build
armagetronad/trunk/build/scripts/lp-upload
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9978
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9986
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/armagetronad/src/tools/tCommandLine.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tCommandLine.cpp 2011-09-23 21:03:25 UTC (rev 9986)
+++ armagetronad/trunk/armagetronad/src/tools/tCommandLine.cpp 2011-09-23 21:30:21 UTC (rev 9987)
@@ -75,6 +75,7 @@
//#define QUIT(x) { std::ostringstream s; s << x; quitWithMessage(s.str().c_str()); name_.Clear(); } exit(0)
//#define QUIT(x) { std::ostringstream s; s << x; quitWithMessage(s.str().c_str()); name_.Clear(); } return false
#define QUIT(x) { std::ostringstream s; s << x; quitWithMessage(s.str().c_str()); name_.Clear();}
+#define CLEAN_QUIT(x) { std::ostringstream s; s << x; quitWithMessagePrepare(s.str().c_str()); name_.Clear(); return false; }
bool tCommandLineData::Analyse(int argc,char **argv)
{
@@ -169,7 +170,7 @@
#endif
else if ( parser.GetSwitch( "--version", "-v") )
{
- QUIT( "This is " << name_ << " version " << *programVersion_ << ".\n" );
+ CLEAN_QUIT( "This is " << name_ << " version " << *programVersion_ << ".\n" );
}
else if ( parser.GetSwitch( "--versioninfo") )
{
Modified: armagetronad/trunk/armagetronad/src/tools/tException.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tException.cpp 2011-09-23 21:03:25 UTC (rev 9986)
+++ armagetronad/trunk/armagetronad/src/tools/tException.cpp 2011-09-23 21:30:21 UTC (rev 9987)
@@ -161,3 +161,17 @@
return description_;
}
+// *******************************************************************************************
+// *
+// * DoGetDescription
+// *
+// *******************************************************************************************
+//!
+//! @return the description
+//!
+// *******************************************************************************************
+
+tString tCleanQuit::DoGetName() const
+{
+ return tString("");
+}
Modified: armagetronad/trunk/armagetronad/src/tools/tException.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tException.h 2011-09-23 21:03:25 UTC (rev 9986)
+++ armagetronad/trunk/armagetronad/src/tools/tException.h 2011-09-23 21:30:21 UTC (rev 9987)
@@ -61,4 +61,10 @@
tString name_; //!< exception name
};
+//! throw if a clean program exit is desired
+class tCleanQuit: public tException
+{
+ virtual tString DoGetName() const;
+};
+
#endif
Modified: armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp 2011-09-23 21:03:25 UTC (rev 9986)
+++ armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp 2011-09-23 21:30:21 UTC (rev 9987)
@@ -904,8 +904,12 @@
// tLocale::Clear();
}
- catch( tException const & e )
+ catch ( tCleanQuit const & e )
{
+ return 0;
+ }
+ catch ( tException const & e )
+ {
try
{
st_PresentError( e.GetName(), e.GetDescription() );
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-23 21:03:25 UTC (rev 9986)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-23 21:30:21 UTC (rev 9987)
@@ -279,7 +279,7 @@
# keep windows build dir
.PRECIOUS: $(RCDIR)/doc.windows.build $(RCDIR)/doc.web.build
-$(SOURCEDIR)/.tag: $(RCDIR)/.tag $(VERSIONTAG) $(INPUTTARBALLBASE)
+$(SOURCEDIR)/.tag: $(INPUTTARBALLBASE)
#
# *****************************************
# * unpacking source *
Modified: armagetronad/trunk/build/portable/build
===================================================================
--- armagetronad/trunk/build/portable/build 2011-09-23 21:03:25 UTC (rev 9986)
+++ armagetronad/trunk/build/portable/build 2011-09-23 21:30:21 UTC (rev 9987)
@@ -60,7 +60,7 @@
fi
done
-if ! echo ${PACKAGE} grep dedicated; then
+if ! echo ${PACKAGE} | grep dedicated; then
# libraries we know are dynamically loaded later, so they don't appear in ldd's output
for library in \
libjpeg.so.62 \
Modified: armagetronad/trunk/build/scripts/lp-upload
===================================================================
--- armagetronad/trunk/build/scripts/lp-upload 2011-09-23 21:03:25 UTC (rev 9986)
+++ armagetronad/trunk/build/scripts/lp-upload 2011-09-23 21:30:21 UTC (rev 9987)
@@ -80,7 +80,7 @@
def prepare_file( filename ):
# Get the signature, if available.
- signature = 'signatures/ ' + filename + '.asc'
+ signature = 'signatures/' + filename + '.asc'
if not os.path.exists(signature):
print 'Calling GPG to create ' + filename + ' signature...'
if subprocess.call(['gpg', '--armor', '--sign', '--output', signature, '--detach-sig', filename]) != 0:
@@ -96,7 +96,7 @@
print "Already exists, delete it first if you want to re-upload it."
return
- signature = 'signatures/ ' + filename + '.asc'
+ signature = 'signatures/' + filename + '.asc'
if os.path.exists(signature):
signature_content = open(signature, 'r').read()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-23 22:39:39
|
Revision: 9989
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9989&view=rev
Author: z-man
Date: 2011-09-23 22:39:32 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9986 to 9988:
------------------------------------------------------------------------
r9988 | bazaaarmagetron | 2011-09-24 00:34:37 +0200 (Sat, 24 Sep 2011) | 2 lines
Manuel Moos: Reinstalling dependency, turns out it's needed.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9986&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9988&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/WorkMakefile
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9986
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9988
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-23 22:34:37 UTC (rev 9988)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-23 22:39:32 UTC (rev 9989)
@@ -279,7 +279,7 @@
# keep windows build dir
.PRECIOUS: $(RCDIR)/doc.windows.build $(RCDIR)/doc.web.build
-$(SOURCEDIR)/.tag: $(INPUTTARBALLBASE)
+$(SOURCEDIR)/.tag: $(INPUTTARBALLBASE) $(RCDIR)/.tag
#
# *****************************************
# * unpacking source *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-26 08:46:13
|
Revision: 9991
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9991&view=rev
Author: z-man
Date: 2011-09-26 08:46:07 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9988 to 9990:
------------------------------------------------------------------------
r9990 | bazaaarmagetron | 2011-09-24 18:07:26 +0200 (Sat, 24 Sep 2011) | 2 lines
Manuel Moos: Adding shorthand for source directory.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9988&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9990&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/WorkMakefile
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9988
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9990
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-09-24 16:07:26 UTC (rev 9990)
+++ armagetronad/trunk/build/WorkMakefile 2011-09-26 08:46:07 UTC (rev 9991)
@@ -279,6 +279,7 @@
# keep windows build dir
.PRECIOUS: $(RCDIR)/doc.windows.build $(RCDIR)/doc.web.build
+sourcedir: $(SOURCEDIR)/.tag
$(SOURCEDIR)/.tag: $(INPUTTARBALLBASE) $(RCDIR)/.tag
#
# *****************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-09-26 21:09:33
|
Revision: 9996
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9996&view=rev
Author: z-man
Date: 2011-09-26 21:09:27 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9990 to 9995:
------------------------------------------------------------------------
r9995 | bazaaarmagetron | 2011-09-26 23:04:18 +0200 (Mon, 26 Sep 2011) | 2 lines
Manuel Moos: Calling ldconfig with full path (/sbin).
------------------------------------------------------------------------
r9994 | bazaaarmagetron | 2011-09-26 13:05:44 +0200 (Mon, 26 Sep 2011) | 1 line
Manuel Moos: More flexible .desktop and icon moving.
------------------------------------------------------------------------
r9993 | bazaaarmagetron | 2011-09-26 13:05:17 +0200 (Mon, 26 Sep 2011) | 2 lines
Manuel Moos: Adapting to sty builds, they have an extra - in their version.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9990&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9995&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9994&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9993&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/IncludesMakefile2
armagetronad/trunk/build/portable/AppRun
armagetronad/trunk/build/portable/build
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9990
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9995
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/build/IncludesMakefile2
===================================================================
--- armagetronad/trunk/build/IncludesMakefile2 2011-09-26 21:04:18 UTC (rev 9995)
+++ armagetronad/trunk/build/IncludesMakefile2 2011-09-26 21:09:27 UTC (rev 9996)
@@ -44,7 +44,7 @@
# *****************************************
#
rm -f $@.proto
- for f in tarballs/*.tar*; do if test $$f -nt $@.proto || ! test -r $@.proto ; then echo $$f | sed -e "s,.*-,," -e "s,\.src\.tar.*,," -e "s,\.tar.*,," > $@.proto; touch $@.proto -r $$f; fi; done
+ for f in tarballs/*.tar*; do if test $$f -nt $@.proto || ! test -r $@.proto ; then echo $$f | sed -e "s,.*${PACKAGE}-,," -e "s,\.src\.tar.*,," -e "s,\.tar.*,," > $@.proto; touch $@.proto -r $$f; fi; done
test -r $@.proto || { echo -e "\n\nNo sources found. Drop a tarball into the tarballs subdirectory\nor check out the main armagetronad CVS module in parallel.\n\n"; rm -f .includes-updated; $(OUTDATE) $(SOURCETAG); false; }
echo VERSION=`cat $@.proto` > $@
if test -z `cat $@.proto | grep -e "alpha\|beta\|rc\|^[^\.]\.[0-9]*[13579]"`; then echo "STABLE=true" >> $@; else echo "STABLE=false" >> $@; fi
Modified: armagetronad/trunk/build/portable/AppRun
===================================================================
--- armagetronad/trunk/build/portable/AppRun 2011-09-26 21:04:18 UTC (rev 9995)
+++ armagetronad/trunk/build/portable/AppRun 2011-09-26 21:09:27 UTC (rev 9996)
@@ -23,7 +23,7 @@
mkdir -p ~/.${EXEC}
if test ! -e ${CACHE} || test ${0} -nt ${CACHE}; then
# find all directories in ld's cache
- for lib in $(ldconfig -p | tail -n +2 | sed -e "s,.* =>,," -e "s,/[^/]*$,," | sort -u); do
+ for lib in $({ /sbin/ldconfig -p || ldconfig -p; } | tail -n +2 | sed -e "s,.* =>,," -e "s,/[^/]*$,," | sort -u); do
extralib=${extralib}:${lib}
done
echo ${extralib} > ${CACHE}
Modified: armagetronad/trunk/build/portable/build
===================================================================
--- armagetronad/trunk/build/portable/build 2011-09-26 21:04:18 UTC (rev 9995)
+++ armagetronad/trunk/build/portable/build 2011-09-26 21:09:27 UTC (rev 9996)
@@ -6,12 +6,12 @@
# add AppRun and desktop file
cp portable/AppRun ${APPDIR}/
find ${APPDIR} -type f -name "*.desktop" -exec mv \{\} ${APPDIR}/ \;
+find ${APPDIR} -type l -name "*.desktop" -exec rm \{\} \;
# hack Icon
-# find ${APPDIR} -type d -name "desktop" -exec ls \{\}/icons/small/ \;
-find ${APPDIR} -type d -name "desktop" -exec cp -ax \{\}/icons/small ${APPDIR} \;
-mv ${APPDIR}/small/*.png ${APPDIR}/${PACKAGE}.png
-rmdir ${APPDIR}/small
+for f in $(find ${APPDIR} -type d -name "desktop"); do
+ cp $f/icons/small/*.png ${APPDIR}/${PACKAGE}.png
+done
# correct absolute symlinks
APPDIR=${APPDIR} $(dirname $0)/fixlinks
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-10-03 12:53:00
|
Revision: 10000
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10000&view=rev
Author: z-man
Date: 2011-10-03 12:52:54 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9995 to 9999:
------------------------------------------------------------------------
r9999 | bazaaarmagetron | 2011-10-03 11:57:56 +0200 (Mon, 03 Oct 2011) | 2 lines
Manuel Moos: Better assertion for clientside machine lookups.
------------------------------------------------------------------------
r9997 | bazaaarmagetron | 2011-10-03 11:44:02 +0200 (Mon, 03 Oct 2011) | 2 lines
Manuel Moos: Spam update is only for servers.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9995&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9999&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9997&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
armagetronad/trunk/armagetronad/src/network/nNetwork.cpp
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9995
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9999
/armagetronad/branches/0.2.8.3:9309-9917
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2011-10-03 09:57:56 UTC (rev 9999)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2011-10-03 12:52:54 UTC (rev 10000)
@@ -9500,6 +9500,11 @@
void ePlayerNetID::UpdateShuffleSpamTesters()
{
+ if( sn_GetNetState() != nSERVER )
+ {
+ return;
+ }
+
for ( int i = se_PlayerNetIDs.Len()-1; i>=0; --i )
{
ePlayerNetID *p = se_PlayerNetIDs( i );
Modified: armagetronad/trunk/armagetronad/src/network/nNetwork.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2011-10-03 09:57:56 UTC (rev 9999)
+++ armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2011-10-03 12:52:54 UTC (rev 10000)
@@ -4710,15 +4710,17 @@
return server;
}
- tASSERT( userID <= MAXCLIENTS+1 );
-
if( sn_GetNetState() != nSERVER )
{
+ tASSERT(userID == 0);
+
// invalid ID, return invalid machine (clients don't track machines)
static nMachine invalid;
return invalid;
}
+ tASSERT( userID <= MAXCLIENTS+1 );
+
// get address
tVERIFY( userID <= MAXCLIENTS+1 );
if( !sn_Connections[userID].socket )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-10-11 10:47:41
|
Revision: 10006
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10006&view=rev
Author: z-man
Date: 2011-10-11 10:47:35 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9999 to 10005:
------------------------------------------------------------------------
r10005 | z-man | 2011-10-11 11:52:12 +0200 (Tue, 11 Oct 2011) | 8 lines
Merging branch 0.2.8.3 from revision 9917 to 10004:
------------------------------------------------------------------------
r10004 | z-man | 2011-10-11 11:45:06 +0200 (Tue, 11 Oct 2011) | 2 lines
Clearing display lists if moviepack seting changed to flush out all texture changes.
------------------------------------------------------------------------
------------------------------------------------------------------------
r10003 | bazaaarmagetron | 2011-10-10 21:58:54 +0200 (Mon, 10 Oct 2011) | 2 lines
Manuel Moos: Clarified that auto login needs a valid global ID
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9999&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10005&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9917&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10004&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10003&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/language/english_base.txt
armagetronad/trunk/armagetronad/src/tron/gGame.cpp
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9999
/armagetronad/branches/0.2.8.3:9309-9917
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10005
/armagetronad/branches/0.2.8.3:9309-10004
Modified: armagetronad/trunk/armagetronad/language/english_base.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/english_base.txt 2011-10-11 09:52:12 UTC (rev 10005)
+++ armagetronad/trunk/armagetronad/language/english_base.txt 2011-10-11 10:47:35 UTC (rev 10006)
@@ -1889,7 +1889,7 @@
player_red_help Lets you choose the red component of your colour.
player_autologin_text Auto Login:
-player_autologin_help When enabled, you will automatically initiate the (usually completely optional) login procedure as soon as you enter a server.
+player_autologin_help When enabled, you will automatically initiate the (usually completely optional) login procedure using the Global ID above as soon as you enter a server.
player_stealth_text Hide Global ID:
player_stealth_help Usually your global ID is shown to everyone when you log in or when someone uses the /players chat command. Enabling this tells the server that you prefer to remain anonymous. The server may still show your ID to moderators and administrators on the server or even decide to ignore your request.
Modified: armagetronad/trunk/armagetronad/src/tron/gGame.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2011-10-11 09:52:12 UTC (rev 10005)
+++ armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2011-10-11 10:47:35 UTC (rev 10006)
@@ -1351,6 +1351,14 @@
{
rSysDep::ClearGL();
}
+
+ static bool lastMoviePack=sg_MoviePack();
+ if(lastMoviePack!=sg_MoviePack())
+ {
+ lastMoviePack=sg_MoviePack();
+ rDisplayList::ClearAll();
+ }
+
RenderAllViewports(grid);
sr_ResetRenderState(true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-10-16 10:33:52
|
Revision: 10020
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10020&view=rev
Author: z-man
Date: 2011-10-16 10:33:46 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 10005 to 10019:
------------------------------------------------------------------------
r10018 | bazaaarmagetron | 2011-10-16 12:14:22 +0200 (Sun, 16 Oct 2011) | 2 lines
Manuel Moos: Delayed processing of activation/deactivation events. They're triggered from a different thread on Windows.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10005&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10018&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10005
/armagetronad/branches/0.2.8.3:9309-10004
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10019
/armagetronad/branches/0.2.8.3:9309-10004
Modified: armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp 2011-10-16 10:21:30 UTC (rev 10019)
+++ armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp 2011-10-16 10:33:46 UTC (rev 10020)
@@ -46,6 +46,7 @@
#include "tRandom.h"
#include "tRecorder.h"
#include "tCommandLine.h"
+#include "tToDo.h"
#include "eAdvWall.h"
#include "eGameObject.h"
#include "uMenu.h"
@@ -469,6 +470,12 @@
}
#ifndef DEDICATED
+static bool sg_active = true;
+static void sg_DelayedActivation()
+{
+ Activate( sg_active );
+}
+
int filter(const SDL_Event *tEvent){
// recursion avoidance
static bool recursion = false;
@@ -530,17 +537,19 @@
if(currentScreensetting.fullscreen ^ lastSuccess.fullscreen) return false;
#endif
int flags = SDL_APPINPUTFOCUS;
- if ( tEvent->active.gain && tEvent->active.state & flags )
- Activate(true);
- if ( !tEvent->active.gain && tEvent->active.state & flags )
- Activate(false);
+ if ( tEvent->active.state & flags )
+ {
+ // con << tSysTimeFloat() << " " << "active: " << (tEvent->active.gain ? "on" : "off") << "\n";
+ sg_active = tEvent->active.gain;
+ st_ToDo(sg_DelayedActivation);
+ }
// reload GL stuff if application gets reactivated
if ( tEvent->active.gain && tEvent->active.state & SDL_APPACTIVE )
{
// just treat it like a screen mode change, gets the job done
- rCallbackBeforeScreenModeChange::Exec();
- rCallbackAfterScreenModeChange::Exec();
+ st_ToDo(rCallbackBeforeScreenModeChange::Exec);
+ st_ToDo(rCallbackAfterScreenModeChange::Exec);
}
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-10-18 17:01:59
|
Revision: 10045
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10045&view=rev
Author: z-man
Date: 2011-10-18 17:01:53 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 10019 to 10044:
------------------------------------------------------------------------
r10044 | bazaaarmagetron | 2011-10-18 18:51:18 +0200 (Tue, 18 Oct 2011) | 2 lines
Manuel Moos: System libs are supposed to get higher priority than the included ones.
------------------------------------------------------------------------
r10032 | bazaaarmagetron | 2011-10-16 20:47:58 +0200 (Sun, 16 Oct 2011) | 2 lines
Manuel Moos: Adding Ubuntu 11.04 to ppa build list.
------------------------------------------------------------------------
r10031 | bazaaarmagetron | 2011-10-16 20:47:12 +0200 (Sun, 16 Oct 2011) | 2 lines
Manuel Moos: Split long command line.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10019&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10044&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10032&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10031&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/WorkMakefile
armagetronad/trunk/build/portable/AppRun
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10019
/armagetronad/branches/0.2.8.3:9309-10004
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044
/armagetronad/branches/0.2.8.3:9309-10004
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-10-18 16:51:18 UTC (rev 10044)
+++ armagetronad/trunk/build/WorkMakefile 2011-10-18 17:01:53 UTC (rev 10045)
@@ -442,7 +442,8 @@
upload-ubuntu-lucid \
upload-ubuntu-maverick \
upload-ubuntu-natty \
-upload-ubuntu-oneiric
+upload-ubuntu-oneiric \
+upload-ubuntu-precise
echo $@
# generic client build
Modified: armagetronad/trunk/build/portable/AppRun
===================================================================
--- armagetronad/trunk/build/portable/AppRun 2011-10-18 16:51:18 UTC (rev 10044)
+++ armagetronad/trunk/build/portable/AppRun 2011-10-18 17:01:53 UTC (rev 10045)
@@ -31,4 +31,8 @@
extralib=$(cat ${CACHE})
fi
-LD_LIBRARY_PATH="${root}/usr/local/lib:${LD_LIBRARY_PATH}${extralib}:${root}/usr/lib" PATH="${root}/usr/local/bin:${PATH}${root}/usr/bin" exec $EXEC ${extraarg} $@
+LD_LIBRARY_PATH="${root}/usr/local/lib${extralib}:${LD_LIBRARY_PATH}:${root}/usr/lib"
+PATH="${root}/usr/local/bin:${PATH}${root}/usr/bin"
+export LD_LIBRARY_PATH
+export PATH
+exec $EXEC ${extraarg} $@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2011-10-21 13:38:55
|
Revision: 10054
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10054&view=rev
Author: z-man
Date: 2011-10-21 13:38:48 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 10044 to 10053:
------------------------------------------------------------------------
r10053 | bazaaarmagetron | 2011-10-21 15:33:55 +0200 (Fri, 21 Oct 2011) | 2 lines
Manuel Moos: Small doc update.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10044&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10053&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/doc/index.html.m4
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044
/armagetronad/branches/0.2.8.3:9309-10004
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10053
/armagetronad/branches/0.2.8.3:9309-10004
Modified: armagetronad/trunk/armagetronad/src/doc/index.html.m4
===================================================================
--- armagetronad/trunk/armagetronad/src/doc/index.html.m4 2011-10-21 13:33:55 UTC (rev 10053)
+++ armagetronad/trunk/armagetronad/src/doc/index.html.m4 2011-10-21 13:38:48 UTC (rev 10054)
@@ -42,24 +42,21 @@
SUBSECTION(Quick start)
PARAGRAPH([
First, you'll be confronted with the selection of your favourite language.
-Use CURSOR LEFT/RIGHT to select, then CURSOR_DOWN to move
-to the "Accept" menu item. Then, press ENTER/RETURN three times.
-You'll immediately be set to fight against one weak AI opponent.
+Use CURSOR UP/DOWN to select, then ENTER/RETURN to accept. Next, there is a quick
+and simplified setup screen. use CURSOR UP/DOWN to navigate the entries, CURSOR LEFT/RIGHT
+to make changes to selection items and use standard editing controls to change your name.
+If you're happy with the choices, press ENTER on any of the two 'Accept' menu items.
+You will be tossed into a training match against a single AI opponent with reduced speed
+where you can learn the keybindings.
])
-SUBSUBSECTION([Initial keyboard layout])
+SUBSECTION([Additional keyboard layout])
PARAGRAPH([
<table>
-<tr><td>turn left </td><td>: y,z,w</td></tr>
-<tr><td>turn right </td><td>: x</td></tr>
-<tr><td>brake </td><td>: v</td></tr>
-<tr><td>switch camera </td><td>: c</td></tr>
-<tr><td>glance </td><td>: cursor left/right/down</td></tr>
-<tr><td></td></tr>
<tr><td>show scores </td><td>: TAB</td></tr>
<tr><td>scroll message console </td><td>: page up/down</td></tr>
-<tr><td>toggle fullscreen </td><td>: f</td></tr>
+<tr><td>toggle fullscreen </td><td>: n</td></tr>
<tr><td></td></tr>
<tr><td width = 200 >pauses/unpauses the game</td><td>: p</td></tr>
<tr><td>quit to the game menu</td><td>: q/ESC</td></tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X