Date: Friday February 2, 2001 @ 3:17 Author: cameron Update of /home/netrek/cvsroot/Vanilla In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv7504 Modified Files: ChangeLog README.releasing Log Message: * ntserv/orbit.c (dock): reworked handling of return status, probably in a superfluous manner, but I've tested the various conditions now. * ntserv/struct.h, ntserv/ntscmds.c (do_nodock), ntserv/main.c (main), ntserv/enter.c (enter): change candock to p_candock to comply with convention. * ntserv/interface.c (lock_player): only mention docking status on a lock if the player is permitted to dock, otherwise treat it as a normal lock on a ship. **************************************** Index: Vanilla/ChangeLog diff -u Vanilla/ChangeLog:1.104 Vanilla/ChangeLog:1.105 --- Vanilla/ChangeLog:1.104 Fri Feb 2 02:40:42 2001 +++ Vanilla/ChangeLog Fri Feb 2 03:17:51 2001 @@ -1,3 +1,17 @@ +Fri Feb 2 19:59:53 2001 James Cameron <quozl at us.netrek.org> + + * ntserv/orbit.c (dock): reworked handling of return status, + probably in a superfluous manner, but I've tested the various + conditions now. + + * ntserv/struct.h, ntserv/ntscmds.c (do_nodock), ntserv/main.c + (main), ntserv/enter.c (enter): change candock to p_candock to + comply with convention. + + * ntserv/interface.c (lock_player): only mention docking status on + a lock if the player is permitted to dock, otherwise treat it as a + normal lock on a ship. + Fri Feb 2 19:31:36 2001 James Cameron <quozl at us.netrek.org> * ntserv/orbit.c (dock): was returning TRUE for failure to dock, @@ -1116,4 +1130,4 @@ update_sys_defaults in updateMessages to a more appropriate location - updateClient in socket.c. - $Id: ChangeLog,v 1.104 2001/02/02 08:40:42 cameron Exp $ + $Id: ChangeLog,v 1.105 2001/02/02 09:17:51 cameron Exp $ Index: Vanilla/README.releasing diff -u Vanilla/README.releasing:1.3 Vanilla/README.releasing:1.4 --- Vanilla/README.releasing:1.3 Fri Feb 2 02:40:42 2001 +++ Vanilla/README.releasing Fri Feb 2 03:17:51 2001 @@ -1,87 +1,88 @@ -$Id: README.releasing,v 1.3 2001/02/02 08:40:42 cameron Exp $ +$Id: README.releasing,v 1.4 2001/02/02 09:17:51 cameron Exp $ Release Procedure - # assumes csh or tcsh - # be in your local copy of the CVS repository - cd Vanilla - - # set variables to ease the rest of this ... (csh or tcsh) - set VS=2.9pl7 - set VL=v_2_9_7 - - # make sure you have committed all changes - cvs -z9 diff -u > tmp.tmp - # review uncommitted changes - more tmp.tmp - # commit changes - cvs -z9 commit - - # tag the release - cvs -z9 tag $VL - cvs -z9 tag -F v_release - - # export the tagged release to a new directory and tar - cd .. - setenv CVSROOT :pserver:cameron at cvs.us.netrek.org:/home/netrek/cvsroot - cvs -z9 export -d Vanilla-$VS -r $VL Vanilla - # package res-rsa with .tar.gz as per Dave Ahn 28th June 2000 - cd Vanilla-$VS - tar xzf ../Vanilla/res-rsa-2.9.2.tar.gz - mv res-rsa-2.9.2/* res-rsa/ - rmdir res-rsa-2.9.2 - cd .. - tar cf Vanilla-$VS.tar Vanilla-$VS - gzip -9 Vanilla-$VS.tar - - # record md5sum of kit for publishing - md5sum Vanilla-$VS.tar.gz > Vanilla-$VS.tar.gz.md5sum - - # test build kit - cd Vanilla-$VS - ./configure --prefix=/tmp/$VS - make - - # test install kit - make install - /tmp/$VS/netrekd - - # test client - cow -h localhost - - # clean up - /tmp/$VS/netrekd stop - rm -rf /tmp/$VS - cd .. - rm -rf Vanilla-$VS - - # rpm packaging - Vanilla/rpm/tar2rpm - cp Vanilla/res-rsa-*.tar.gz /usr/src/redhat/SOURCES - cd /usr/src/redhat/SPECS - rpm -ba netrek.spec - # test package install - - # send .tar.gz and .rpm to ftp sites - ftp://ftp.netrek.org/pub/netrek/incoming/ (note 15 second login timer) - ftp://ftp.real-time.com/pub/Incoming/ +# assumes csh or tcsh +# be in your local copy of the CVS repository +cd Vanilla + +# set variables to ease the rest of this ... (csh or tcsh) +set VS=2.9pl7 +set VL=v_2_9_7 + +# make sure you have committed all changes +cvs -z9 diff -u > tmp.tmp +# review uncommitted changes +more tmp.tmp +# commit changes +cvs -z9 commit + +# tag the release +cvs -z9 tag $VL +cvs -z9 tag -F v_release + +# export the tagged release to a new directory and tar +cd .. +setenv CVSROOT :pserver:cameron at cvs.us.netrek.org:/home/netrek/cvsroot +cvs -z9 export -d Vanilla-$VS -r $VL Vanilla +# package res-rsa with .tar.gz as per Dave Ahn 28th June 2000 +cd Vanilla-$VS +tar xzf ../Vanilla/res-rsa-2.9.2.tar.gz +mv res-rsa-2.9.2/* res-rsa/ +rmdir res-rsa-2.9.2 +cd .. +tar cf Vanilla-$VS.tar Vanilla-$VS +gzip -9 Vanilla-$VS.tar + +# record md5sum of kit for publishing +md5sum Vanilla-$VS.tar.gz > Vanilla-$VS.tar.gz.md5sum + +# test build kit +cd Vanilla-$VS +./configure --prefix=/tmp/$VS +make + +# test install kit +make install +/tmp/$VS/netrekd + +# test client +cow -h localhost + +# clean up +/tmp/$VS/netrekd stop +rm -rf /tmp/$VS +cd .. +rm -rf Vanilla-$VS + +# rpm packaging +Vanilla/rpm/tar2rpm +cp Vanilla/res-rsa-*.tar.gz /usr/src/redhat/SOURCES +cd /usr/src/redhat/SPECS +rpm -ba netrek.spec +# test package install + +# send .tar.gz and .rpm to ftp sites +ftp://ftp.netrek.org/pub/netrek/incoming/ (note 15 second login timer) +ftp://ftp.real-time.com/pub/Incoming/ - # notify mirror owners, include URL of incoming copy and md5sum. - mailto:vanilla-list at us.netrek.org +# notify mirror owners, include URL of incoming copy and md5sum. +mailto:vanilla-list at us.netrek.org - # build differences between this version and previous +# build differences between this version and previous - # update web page - http://vanilla.us.netrek.org/index.html - setenv CVSROOT :pserver:cameron at cvs.us.netrek.org:/home/netrek/cvsroot - cvs checkout web [or] cvs update - # review differences and generate short change list in index.html - cvs commit - - # await mirror completion - # notify others - mailto:vanilla-announce at us.netrek.org - news:rec.games.netrek +# update web page +http://vanilla.us.netrek.org/index.html +setenv CVSROOT :pserver:cameron at cvs.us.netrek.org:/home/netrek/cvsroot +cvs checkout web [or] cvs update +# review differences and generate short change list in index.html +cvs commit + +# await mirror completion +# notify others +mailto:vanilla-announce at us.netrek.org +news:rec.games.netrek - # update version number, patchlevel.h, version.h, rpm/netrek.spec, rpm/tar2rpm here +# update version number in files +# patchlevel.h, version.h, rpm/netrek.spec, rpm/tar2rpm, README.releasing