Author: soliton
Date: Thu Mar 27 02:45:06 2008
New Revision: 25177
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25177&view=rev
Log:
* use scons for trunk builds
* use svnversion to get the revision
Modified:
trunk/utils/mp-server/update_server
Modified: trunk/utils/mp-server/update_server
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/mp-server/update_server?rev=25177&r1=25176&r2=25177&view=diff
==============================================================================
--- trunk/utils/mp-server/update_server (original)
+++ trunk/utils/mp-server/update_server Thu Mar 27 02:45:06 2008
@@ -22,14 +22,16 @@
fi
case $SERVER in
- 1.2 ) cd $SOURCE/1.2 || exit 1
- CXXFLAGS='-ggdb3 -pg'
+ 1.2 ) cd $SOURCE/1.2 || exit 1
+ CXXFLAGS="$CXXFLAGS -ggdb3"
;;
- 1.4 ) cd $SOURCE/1.4 || exit 1
- CXXFLAGS='-ggdb3 -pg -DNUM_SHARDS=7'
+ 1.4 ) cd $SOURCE/1.4 || exit 1
+ CXXFLAGS="$CXXFLAGS -ggdb3 -DNUM_SHARDS=7"
+ #SCONS=yes
;;
- * ) cd $SOURCE/trunk || exit 1
- CXXFLAGS='-O0 -ggdb3 -pg -DNUM_SHARDS=7'
+ * ) cd $SOURCE/trunk || exit 1
+ CXXFLAGS="$CXXFLAGS -ggdb3 -DNUM_SHARDS=7 -O0"
+ SCONS=yes
;;
esac
@@ -38,26 +40,33 @@
REVISION="-r $2"
fi
echo -n 'svn update... '
-rev=$(svn up $REVISION | tail -n 1 | sed -e 's/[^0-9]//g')
+svn up $REVISION > /dev/null
+rev=$(svnversion -n src/)
+echo "to $rev"
if [ "$rev" == "" ]; then
echo "No revision information found."
exit 1
fi
# reminder for local changes
-echo "to $rev"
-svn status
+#svn status
DIR=wesnothd-svn-${rev}_$SERVER
-mkdir $BUILD/$DIR
+mkdir -p $BUILD/$DIR
-echo 'autogen.sh and configure...'
-./autogen.sh > $BUILD/$DIR/autogen.log
-./configure --prefix=$BUILD/$DIR --program-suffix=-$SERVER --enable-server
--enable-raw-sockets --disable-game --with-fifodir=$BUILD/$DIR/var/run
--disable-nls --enable-lite > $BUILD/$DIR/configure.log CXXFLAGS=$CXXFLAGS
LDFLAGS='-pg'
-make clean > /dev/null
+if [ "$SCONS" == "yes" ]; then
+ mkdir -p $BUILD/$DIR/var/run
+ CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS scons wesnothd-install
prefix=$BUILD/$DIR fifodir=$BUILD/$DIR/var/run raw_sockets=1 profile=1
fribidi=0 python=0
+ mv $BUILD/$DIR/bin/wesnothd $BUILD/$DIR/bin/wesnothd-$SERVER
+else
+ echo 'autogen.sh and configure...'
+ ./autogen.sh > $BUILD/$DIR/autogen.log
+ ./configure --prefix=$BUILD/$DIR --program-suffix=-$SERVER
--enable-server --enable-raw-sockets --disable-game
--with-fifodir=$BUILD/$DIR/var/run --disable-nls --enable-lite --enable-profile
--with-boost=$HOME/tools > $BUILD/$DIR/configure.log CXXFLAGS=$CXXFLAGS
LDFLAGS=$LDFLAGS
+ make clean > /dev/null
-echo 'make...'
-make > $BUILD/$DIR/make.log || exit 1
-echo 'make install...'
-make install > $BUILD/$DIR/install.log || exit 1
+ echo 'make...'
+ make > $BUILD/$DIR/make.log || exit 1
+ echo 'make install...'
+ make install > $BUILD/$DIR/install.log || exit 1
+fi
cd $SERVERBASE
if [ -p $SOCKET ]; then
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
