Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880
Modified Files:
ChangeLog Makefile.in NEWS PROJECTS README.releasing
Added Files:
STYLE
Log Message:
--- NEW FILE: STYLE ---
Coding style for patch acceptance on Vanilla project.
* for minor changes, do not change indentation,
* for major changes to a function, reindent the function,
* for major changes to a file, reindent the file.
* indent by either two or four spaces, or use tabs, just be consistent within a file, preferred is four spaces.
{{{
static int foo(int a)
{
if (a) {
func(abc);
def;
} else {
ghi;
jkl;
}
}
}}}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ChangeLog 21 Apr 2006 11:38:57 -0000 1.23
+++ ChangeLog 22 Apr 2006 02:16:42 -0000 1.24
@@ -1,3 +1,18 @@
+Sat Apr 22 12:07:50 2006 James Cameron <quozl at us.netrek.org>
+
+ * Makefile.in (dist): avoid certain CVS files.
+
+Sat Apr 22 11:47:55 2006 James Cameron <quozl at us.netrek.org>
+
+ * ntserv/feature.c, ntserv/wander2.c (pfree): fix two small
+ valgrind leaks.
+
+ * */*.c, */*.h: fix compilation warnings on GCC 4.0.3.
+
+Sat Apr 22 10:37:51 2006 James Cameron <quozl at us.netrek.org>
+
+ * tools/watchmes.c (logmessage): avoid built-in function name.
+
Fri Apr 14 22:21:22 2006 James Cameron <quozl at us.netrek.org>
* ntserv/daemonII.c (move): prevent tournament mode from starting
Index: Makefile.in
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.in 22 Feb 2006 09:18:30 -0000 1.8
+++ Makefile.in 22 Apr 2006 02:16:44 -0000 1.9
@@ -5,7 +5,7 @@
#
PACKAGE=netrek-server-vanilla
-VERSION=2.10.2
+VERSION=2.10.3
VPATH = @srcdir@
srcdir = @srcdir@
@@ -190,7 +190,6 @@
# subdirectories
cp -rp docs gum include keycomp motd newstartd ntserv php \
pledit res-rsa robotd robots sequencer tools xsg $(NAME)/
- rm -rf $(NAME)/*/CVS $(NAME)/*/*/CVS
# packaging subdirectories (debian)
mkdir $(NAME)/debian $(NAME)/rpm
cp -p debian/README.Debian debian/changelog debian/control \
@@ -198,6 +197,10 @@
$(NAME)/debian
# packaging subdirectories (rpm)
cp -rp rpm $(NAME)/
+ # strip out surplus
+ rm -rf $(NAME)/*/CVS $(NAME)/*/*/CVS
+ rm -rf $(NAME)/.cvsignore $(NAME)/*/.cvsignore
+ rm -rf $(NAME)/*/.deps $(NAME)/*~ $(NAME)/*/*~
# build
GZIP=--best tar cfz $(NAME).tar.gz $(NAME)
rm -rf $(NAME)
Index: README.releasing
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/README.releasing,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- README.releasing 1 Mar 2006 22:26:48 -0000 1.12
+++ README.releasing 22 Apr 2006 02:16:45 -0000 1.13
@@ -7,8 +7,8 @@
cd Vanilla
# set variables
-VS=2.10.2
-VL=v_2_10_2
+VS=2.10.3
+VL=v_2_10_3
PN=netrek-server-vanilla
# check version numbers in files
@@ -29,6 +29,9 @@
# commit changes
cvs commit -m "prerelease $VS"
+# reduce source tree to only CVS files, or fix .cvsignore
+cvs update > tmp
+
# tag the release
cvs tag -F $VL
cvs tag -F v_release
@@ -48,6 +51,7 @@
cd $PN-$VS
./configure --prefix=/tmp/$VS
make
+# FUTURE, test that the tree is returned to pristine condition by distclean
# test install kit
make install
Index: NEWS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- NEWS 14 Apr 2006 10:19:17 -0000 1.13
+++ NEWS 22 Apr 2006 02:16:45 -0000 1.14
@@ -1,4 +1,8 @@
-- fix client/server error over army capacity of AS in certain cases [balcerski]
+- fix valgrind detected heap leaks [Cameron]
+- compilation fixes for GCC 4.0.3 [Cameron]
+- remove some crud from tar.gz [Cameron]
+- add coding STYLE file [Cameron]
+- fix client/server error over army capacity of AS in certain cases [Balcerski]
- use IP addresses only for t-mode scum test [Cameron]
- compilation fix for FreeBSD [O'Conner]
Index: PROJECTS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/PROJECTS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PROJECTS 12 Apr 2006 12:58:11 -0000 1.6
+++ PROJECTS 22 Apr 2006 02:16:45 -0000 1.7
@@ -3,6 +3,10 @@
List of things to do in the future
+ - metaserver begins to list robots on a server after the
+ server has stopped sending player count updates by perhaps
+ the TCP query from the server is mistaken.
+
- vote per IP address only, not per slot
- separate ban and eject votes, ban to include effect of