Source Mage code commit list

[Alexander Tsamutali <scm AT sourcemage.org>]

GIT changes to master games grimoire by Alexander Tsamutali 
<astsmtl AT gmail.com>:

 games-strategy-rts/glest/BUILD     |    1 
 games-strategy-rts/glest/DETAILS   |   27 ++++++++++++-----------
 games-strategy-rts/glest/FINAL     |    1 
 games-strategy-rts/glest/HISTORY   |    5 ++++
 games-strategy-rts/glest/INSTALL   |   16 ++++++++-----
 games-strategy-rts/glest/PRE_BUILD |   43 
++++---------------------------------
 games-strategy-rts/glest/glest     |   25 ++++++++++++++++-----
 7 files changed, 54 insertions(+), 64 deletions(-)

New commits:
commit 6cffebe17607097a6d8b3b7ebc006aa738df1a8a
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

    games-strategy-rts/glest: updated to 3.1.2

diff --git a/games-strategy-rts/glest/BUILD b/games-strategy-rts/glest/BUILD
index da8558c..b5c6763 100755
--- a/games-strategy-rts/glest/BUILD
+++ b/games-strategy-rts/glest/BUILD
@@ -1,4 +1,3 @@
-cd mk/linux                                          &&
 # default_games_build
 OPTS="$OPTS --bindir=${INSTALL_ROOT}/usr/games       \
            --datadir=${INSTALL_ROOT}/usr/share/games \
diff --git a/games-strategy-rts/glest/DETAILS 
b/games-strategy-rts/glest/DETAILS
index 22054fb..605d9b8 100755
--- a/games-strategy-rts/glest/DETAILS
+++ b/games-strategy-rts/glest/DETAILS
@@ -1,16 +1,17 @@
-           SPELL=glest
-         VERSION=2.0.0
-          SOURCE=${SPELL}_source_${VERSION}.zip
-   SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:75e2f68257b553bcff266544aaa2c53bc0f572c32bcd43712f03e85fa63953b29aca70e1f67883de15d36bacf1536c7c40790bcb9194823e4165511f93610ba7
-         SOURCE2=${SPELL}_data_${VERSION}.zip
-  SOURCE2_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE2}
-    
SOURCE2_HASH=sha512:025c0b6135c3a40e6a851aea3a2ab59924ccfbab33c073b50bd84aba8e68a5b542f5868777df674b53e9e021513f2a2a3402a9fcc5bee2068b5e86c6ba005f9b
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}_source_${VERSION}
-        WEB_SITE=http://glest.org/
-         ENTERED=20060818
-      LICENSE[0]=GPL
-           SHORT="Glest is a cross-platform 3D realtime strategy game"
+            SPELL=glest
+          VERSION=3.1.2
+           SOURCE=${SPELL}-source-${VERSION}.tar.bz2
+    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+      
SOURCE_HASH=sha512:5039851b7e754557c1324fa030666ebf54f65b0f39433e26a48b01a6c650e46e86a046aded41f3d9cd274dfec018b0b77d966600e1523e8e50884fd5b7448193
+          SOURCE2=${SPELL}_data_${VERSION}.zip
+   SOURCE2_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE2}
+     
SOURCE2_HASH=sha512:146b6ce595e2285f519582509d179973f8bd47255cbda7eb975867e5d5b1301d796ad77965f8d451c339195be5b85d8210db6d99f6aed0ae206c8808242a3bf1
+ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-source-${VERSION}
+SOURCE2_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}_game
+         WEB_SITE=http://glest.org/
+          ENTERED=20060818
+       LICENSE[0]=GPL
+            SHORT="Glest is a cross-platform 3D realtime strategy game"
 cat << EOF
 Glest is a free 3D real time strategy game, available for several operating
 systems and that can be modified using XML and a set of tools
diff --git a/games-strategy-rts/glest/FINAL b/games-strategy-rts/glest/FINAL
new file mode 100755
index 0000000..525480d
--- /dev/null
+++ b/games-strategy-rts/glest/FINAL
@@ -0,0 +1 @@
+rm -rf $SOURCE2_DIRECTORY
diff --git a/games-strategy-rts/glest/HISTORY 
b/games-strategy-rts/glest/HISTORY
index 12349ae..559cf6c 100644
--- a/games-strategy-rts/glest/HISTORY
+++ b/games-strategy-rts/glest/HISTORY
@@ -1,2 +1,7 @@
+2008-05-30 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DETAILS, PRE_BUILD, BUILD, INSTALL: Updated to 3.1.2
+       * FINAL: Added to remove $SOURCE2_DIRECTORY
+       * glest: Replaced by script from Debian
+
 2006-08-18 Pol Vinogradov <vin.public AT gmail.com>
        * BUILD, DETAILS, DEPENDS, INSTALL, PRE_BUILD, glest: created spell
diff --git a/games-strategy-rts/glest/INSTALL 
b/games-strategy-rts/glest/INSTALL
index 551d642..b68ce79 100755
--- a/games-strategy-rts/glest/INSTALL
+++ b/games-strategy-rts/glest/INSTALL
@@ -1,6 +1,10 @@
-install ${SCRIPT_DIRECTORY}/${SPELL} ${INSTALL_ROOT}/usr/games/${SPELL}      
                &&
-sedit "s:SMGL_DIR:${TRACK_ROOT}/usr/share/games/${SPELL}:" 
${TRACK_ROOT}/usr/games/${SPELL}  &&
-cd ${SOURCE_DIRECTORY}  &&
-install -m 0755 mk/linux/${SPELL} ${INSTALL_ROOT}/usr/share/games/${SPELL}   
                &&
-install -m 0644 mk/linux/${SPELL}.ini 
${INSTALL_ROOT}/usr/share/games/${SPELL}               &&
-cp -R source/${SPELL}_game/{techs,data,maps,tilesets} 
${INSTALL_ROOT}/usr/share/games/${SPELL}
+INSTALL_DIRECTORY=$INSTALL_ROOT/usr/share/games/glest &&
+mkdir -p $INSTALL_DIRECTORY &&
+cp -R $SOURCE2_DIRECTORY/* $INSTALL_DIRECTORY &&
+cd $INSTALL_DIRECTORY &&
+find_and_scam &&
+cd $SOURCE_DIRECTORY &&
+install -m 640 -g games glest.ini $INSTALL_DIRECTORY &&
+install -m 750 -g games glest $INSTALL_DIRECTORY &&
+install -m 750 -g games $SPELL_DIRECTORY/glest $INSTALL_ROOT/usr/games/ &&
+sedit "s:_MAINDIR_:$TRACK_ROOT/usr/share/games/glest:" 
$INSTALL_ROOT/usr/games/glest
diff --git a/games-strategy-rts/glest/PRE_BUILD 
b/games-strategy-rts/glest/PRE_BUILD
index 4aeb28b..82c93a1 100755
--- a/games-strategy-rts/glest/PRE_BUILD
+++ b/games-strategy-rts/glest/PRE_BUILD
@@ -1,38 +1,5 @@
-default_pre_build                &&
-cd ${SOURCE_DIRECTORY}           &&
-
-# dos2unix conversion
-local file                       &&
-for file in $(find {source,mk} -type f); do
-  sedit "s:\r::g" ${file}
-done                             &&
-
-cd ${SOURCE_DIRECTORY}/source    &&
-unpack_file 2                    &&
-
-# dirty hacks ;)
-sedit "s/ProjectileParticleSystem::strToTrajectory/strToTrajectory/"         
                    \
-shared_lib/include/graphics/particle.h  &&
-cd ${SPELL}_game       &&
-sedit "s:setFile(\"glest.log\"):setFile(\"${TRACK_ROOT}/tmp/glest.log\"):" 
main/program.cpp      &&
-sedit 's:#include "main_menu.h":#include <stdlib.h>\n#include 
<string.h>\n\n#include "main_menu.h":'  \
-menu/main_menu.cpp     &&
-sedit 's:config.save("glest.ini"):config.save(strcat(getenv("HOME"), 
"/.glest/glest.ini")):'          \
-menu/main_menu.cpp     &&
-sedit 's:#include "renderer.h":#include <stdlib.h>\n#include 
<string.h>\n\n#include "renderer.h":'    \
-graphics/renderer.cpp  &&
-sedit 's:config.save("glest.ini"):config.save(strcat(getenv("HOME"), 
"/.glest/glest.ini")):'          \
-graphics/renderer.cpp  &&
-sedit 's:#include "config.h":#include <stdlib.h>\n#include 
<string.h>\n\n#include "config.h":'   \
-global/config.cpp      &&
-sedit 's:properties.load("glest.ini"):properties.load(strcat(getenv("HOME"), 
"/.glest/glest.ini")):'  \
-global/config.cpp      &&
-cd ${SOURCE_DIRECTORY}/mk/linux  &&
-sedit "/COMPILER_CFLAGS_optimize/s:-O3 -g3:${CFLAGS}:" Jamrules      &&
-sedit "/COMPILER_C++FLAGS_optimize/s:-O3 -g3:${CXXFLAGS}:" Jamrules  &&
-sedit "/COMPILER_LFLAGS_optimize/s:-O3 -g3:${LDFLAGS}:" Jamrules     &&
-chmod a+x *.sh                   &&
-if [[ ! -e configure ]] ; then
-  ./autogen.sh
-fi                               &&
-cd ${SOURCE_DIRECTORY}
+default_pre_build &&
+cd $BUILD_DIRECTORY &&
+unpack_file 2 &&
+cd $SOURCE_DIRECTORY &&
+sedit 
"s:logger.setFile(\"glest.log\"):logger.setFile(\"${TRACK_ROOT}/tmp/glest.log\"):"
 glest_game/main/program.cpp
diff --git a/games-strategy-rts/glest/glest b/games-strategy-rts/glest/glest
old mode 100644
new mode 100755
index 76a9824..f8aa42c
--- a/games-strategy-rts/glest/glest
+++ b/games-strategy-rts/glest/glest
@@ -1,7 +1,20 @@
 #!/bin/sh
-mkdir -p $HOME/.glest
-cd SMGL_DIR
-if [[ ! -e $HOME/.glest/glest.ini ]] ; then
-  cp glest.ini $HOME/.glest
-fi
-./glest "${@}"
+
+MAINDIR=_MAINDIR_
+DIR=$HOME/.glest
+[ -d $DIR ] || mkdir $DIR
+cd $DIR
+[ -f glest.ini ] || cp $MAINDIR/glest.ini .
+[ -h glest ] || ln -s $MAINDIR/glest .
+[ -f servers.ini ] || cp $MAINDIR/servers.ini .
+for i in data docs scenarios techs tilesets; do
+      [ -h $i ] || ln -s $MAINDIR/$i .
+done
+[ -d maps ] || mkdir maps
+cd maps
+for i in $MAINDIR/maps/*; do
+      [ -h `basename $i` ] || ln -s $i .
+done
+cd ..
+
+exec ./glest