Author: soliton
Date: Wed May 27 22:52:32 2009
New Revision: 35916
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35916&view=rev
Log:
various tweaks/fixes after testing
Modified:
trunk/utils/mp-server/run_server
trunk/utils/mp-server/update_server
Modified: trunk/utils/mp-server/run_server
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/mp-server/run_server?rev=35916&r1=35915&r2=35916&view=diff
==============================================================================
--- trunk/utils/mp-server/run_server (original)
+++ trunk/utils/mp-server/run_server Wed May 27 22:52:32 2009
@@ -55,7 +55,7 @@
DATE=$(date +"%Y%m%d-%H%M%S")
[ -r "$SERVERBASE"/redirect.cfg ] && PORT=$(sed -nre '/port=/s/[
\t]*port="?([0-9]+)"?/\1/p' "$SERVERBASE"/redirect.cfg)
BUILDDIR=$(readlink "$SERVERBASE"/build)
- REV=r$(echo $BUILDDIR | sed -nre
"s,.*wesnothd-svn-([0-9:SM]+)_$SERVER/$,\1,p")
+ REV=r$(echo $BUILDDIR | sed -nre
"s,.*wesnothd-svn-([0-9:SM]+)_$SERVER$,\1,p")
LOG="wesnothd.$DATE.$REV.log"
bin/wesnothd-$SERVER -c "$SERVERBASE"/wesnothd.cfg --port $PORT
--threads $THREADS $PARAMETERS > "$SERVERBASE/logs/$LOG" 2>&1 &
PID=$!
Modified: trunk/utils/mp-server/update_server
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/mp-server/update_server?rev=35916&r1=35915&r2=35916&view=diff
==============================================================================
--- trunk/utils/mp-server/update_server (original)
+++ trunk/utils/mp-server/update_server Wed May 27 22:52:32 2009
@@ -2,7 +2,6 @@
die() { echo >&2 "$@"; exit 1; }
[ $# -gt 0 ] && [ $# -lt 4 ] || die "Syntax: $(basename $0) [-c] <server
version> [<revision>]"
set -o errexit
-set -o nounset
VERSION="$1"
case "$VERSION" in
@@ -42,6 +41,7 @@
LDFLAGS="$LDFLAGS -pg"
[ "$VERSION" = "1.4" ] && SCONS=no
fi
+set -o nounset
printf 'svn update... '
REVISION="${2:+-r $2}"
@@ -61,10 +61,10 @@
export CXXFLAG LDFLAGS
if [ $SCONS = yes ]; then
if [ $TYPE = wesnothd ]; then
- BUILD_FLAGS="fifodir=\"$BUILD_DIR\"/var/run raw_sockets=1
forum_user_handler=1"
+ BUILD_FLAGS="'fifodir=$BUILD_DIR/var/run' raw_sockets=1
forum_user_handler=1"
case $(hostname) in
- gonzo.dicp.de) BUILD_FLAGS="fifodir=\"$BUILD_DIR\"/var/run
raw_sockets=1 boostdir=\"$HOME\"/tools/include boostlibdir=\"$HOME\"/tools/lib
boost_suffix=-mt" ;;
- basilic) BUILD_FLAGS="fifodir=\"$BUILD_DIR\"/var/run
raw_sockets=1" ;;
+ gonzo.dicp.de) BUILD_FLAGS="'fifodir=$BUILD_DIR/var/run
raw_sockets=1' boostdir=$HOME/tools/include boostlibdir=$HOME/tools/lib
boost_suffix=-mt" ;;
+ basilic) BUILD_FLAGS="'fifodir=$BUILD_DIR/var/run
raw_sockets=1'" ;;
esac
fi
mkdir -p "$BUILD_DIR"/var/run
@@ -72,7 +72,7 @@
scons install-$TYPE prefix="$BUILD_DIR" program_suffix=-"$VERSION"
$BUILD_FLAGS profile=0 fribidi=0 python=0 localedir= prefsdir= >
"$BUILD_DIR"/scons.log
else
if [ $TYPE = wesnothd ]; then
- BUILD_FLAGS="--enable-server --enable-raw-sockets
--with-fifodir=\"$BUILD_DIR\"/var/run --with-boost="$HOME"/tools"
+ BUILD_FLAGS="--enable-server --enable-raw-sockets
'--with-fifodir=$BUILD_DIR/var/run' '--with-boost=$HOME/tools'"
else
BUILD_FLAGS="--enable-campaign-server"
fi
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
