Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Andraž Levstik (9cbf182ec6def0be336067f43a8120edb28d70a8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Andraž Levstik (9cbf182ec6def0be336067f43a8120edb28d70a8)
  • Date: Tue, 24 Apr 2007 18:49:42 -0500

GIT changes to master games grimoire by Andraž Levstik <ruskie AT mages.ath.cx>:

ChangeLog | 3 +
dev/null |binary
games-puzzles/pipepanic/BUILD | 1
games-puzzles/pipepanic/DEPENDS | 1
games-puzzles/pipepanic/DETAILS | 15 +++++
games-puzzles/pipepanic/HISTORY | 5 +
games-puzzles/pipepanic/INSTALL | 3 +
games-puzzles/pipepanic/PRE_BUILD | 10 +++
games-strategy-rts/widelands/BUILD | 13 ++++
games-strategy-rts/widelands/CONFIGURE | 7 ++
games-strategy-rts/widelands/DEPENDS | 11 ++--
games-strategy-rts/widelands/DETAILS | 23
++++----
games-strategy-rts/widelands/HISTORY | 10 +++
games-strategy-rts/widelands/INSTALL | 27
++++------
games-strategy-rts/widelands/PREPARE | 8 +-
games-strategy-rts/widelands/PRE_BUILD | 26
+++------
games-strategy-rts/widelands/widelands | 4 -
games-strategy-rts/widelands/widelands-b9half-source.tar.bz2.sig | 0
18 files changed, 109 insertions(+), 58 deletions(-)

New commits:
commit 9cbf182ec6def0be336067f43a8120edb28d70a8
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

widelands: version update, build system revamp

commit 8a2a6597cf83a3a5ddc5bf45c64b345e23c4559f
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

games-puzzle/pipepanic: new game, connect the pipes from point a to b

diff --git a/ChangeLog b/ChangeLog
index 8c66482..07835dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-04-24 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * games-puzzle/pipepanic: new game, connect the pipes from point a to
b
+
2007-04-23 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* games-arcade-2d/diameter: new game, arcade with some adventure and
economy
diff --git a/games-puzzles/pipepanic/BUILD b/games-puzzles/pipepanic/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/games-puzzles/pipepanic/BUILD
@@ -0,0 +1 @@
+make
diff --git a/games-puzzles/pipepanic/DEPENDS b/games-puzzles/pipepanic/DEPENDS
new file mode 100755
index 0000000..7ddd3ee
--- /dev/null
+++ b/games-puzzles/pipepanic/DEPENDS
@@ -0,0 +1 @@
+depends sdl
diff --git a/games-puzzles/pipepanic/DETAILS b/games-puzzles/pipepanic/DETAILS
new file mode 100755
index 0000000..5cd1503
--- /dev/null
+++ b/games-puzzles/pipepanic/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=pipepanic
+ VERSION=0.1.3
+ SOURCE=$SPELL-$VERSION-source.tar.gz
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-source
+ SOURCE_URL[0]=http://www.users.waitrose.com/~thunor/$SPELL/dload/$SOURCE
+
SOURCE_HASH=sha512:468f3194976c7030c2fa3d8f30eaa13cc25e0b04feeb48a5d1267d119eb991618bad14ddba0a8268e6b92f38f2a17bc5b119728b222b0ee50494807832ad2ab7
+ WEB_SITE=http://www.users.waitrose.com/~thunor/pipepanic
+ UPDATED=20060602
+ LICENSE[0]=GPL
+ SHORT="Pipepanic is a pipe connecting game"
+cat << EOF
+Pipepanic is a pipe connecting game using libSDL that is playable
+on Linux PCs and the Sharp Zaurus. Connect as many different shaped
+pipes together as possible within the time given.
+EOF
diff --git a/games-puzzles/pipepanic/HISTORY b/games-puzzles/pipepanic/HISTORY
new file mode 100644
index 0000000..4b1dc50
--- /dev/null
+++ b/games-puzzles/pipepanic/HISTORY
@@ -0,0 +1,5 @@
+2007-04-24 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: cleaned up ALL
+
+2006-06-02 Vladimir Navrat <vn158 AT seznam.cz>
+ * ALL: Spell created
diff --git a/games-puzzles/pipepanic/INSTALL b/games-puzzles/pipepanic/INSTALL
new file mode 100755
index 0000000..9f6a615
--- /dev/null
+++ b/games-puzzles/pipepanic/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+cd ${INSTALL_ROOT}/usr/share/games/pipepanic &&
+find_and_scam
diff --git a/games-puzzles/pipepanic/PRE_BUILD
b/games-puzzles/pipepanic/PRE_BUILD
new file mode 100755
index 0000000..0dd7f37
--- /dev/null
+++ b/games-puzzles/pipepanic/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "7s:-O2:${CFLAGS}:" Makefile &&
+sedit "9s:LDFLAGS.*:LDFLAGS=${LDFLAGS}:" Makefile &&
+sedit "23s:DATADIR.*:DATADIR
\"${INSTALL_ROOT}/usr/share/games/pipepanic/\":" main.h &&
+echo -e "
+install: all
+\tinstall -v pipepanic ${INSTALL_ROOT}/usr/games
+\tinstall -v *.bmp ${INSTALL_ROOT}/usr/share/games/pipepanic
+" >> Makefile
diff --git a/games-strategy-rts/widelands/BUILD
b/games-strategy-rts/widelands/BUILD
index 8f58e6d..ce0dcf1 100755
--- a/games-strategy-rts/widelands/BUILD
+++ b/games-strategy-rts/widelands/BUILD
@@ -1 +1,12 @@
-make
+WIDELANDS_GGZ=${WIDELANDS_GGZ/y/1} &&
+WIDELANDS_GGZ=${WIDELANDS_GGZ/n/0} &&
+pushd utils &&
+tar -xf scons-local-0.96.1.tar.gz &&
+popd &&
+utils/scons.py \
+ install_prefix=${INSTALL_ROOT}/usr \
+ build=${WIDELANDS_BUILD} \
+ use_ggz=${WIDELANDS_GGZ} &&
+WIDELANDS_GGZ=${WIDELANDS_GGZ/1/y} &&
+WIDELANDS_GGZ=${WIDELANDS_GGZ/0/n}
+
diff --git a/games-strategy-rts/widelands/CONFIGURE
b/games-strategy-rts/widelands/CONFIGURE
index 7043ed1..9ea7b72 100755
--- a/games-strategy-rts/widelands/CONFIGURE
+++ b/games-strategy-rts/widelands/CONFIGURE
@@ -1,2 +1,7 @@
-config_query_list WIDELANDS_BUILD "What type of build?" release debug &&
+config_query_list WIDELANDS_BUILD "What type of build?" \
+ release \
+ debug \
+ debug-no-parachute \
+ debug-slow \
+ profile &&
config_query WIDELANDS_GGZ "Enable GGZ support?" n
diff --git a/games-strategy-rts/widelands/DEPENDS
b/games-strategy-rts/widelands/DEPENDS
index 7d52b6c..4aa9ab7 100755
--- a/games-strategy-rts/widelands/DEPENDS
+++ b/games-strategy-rts/widelands/DEPENDS
@@ -1,20 +1,23 @@
depends g++ &&
+# use internal scons -external one is broken
+#depends scons &&
depends python &&
depends gettext &&
+depends paragui &&
depends libpng &&
depends zlib &&
depends sdl &&
depends sdl_image &&
+depends sdl_mixer &&
depends sdl_ttf &&
depends sdl_net &&
-depends doxygen &&

-if [ "$WIDELANDS_GGZ" == "y" ]; then
+if [[ "$WIDELANDS_GGZ" == "y" ]]; then
depends libggz &&
depends ggz-server &&
depends ggz-client-libs
fi &&

-if [ "$WIDELANDS_CVS" == "y" ]; then
- depends CVS
+if [[ "$WIDELANDS_SCM" == "y" ]]; then
+ depends subversion
fi
diff --git a/games-strategy-rts/widelands/DETAILS
b/games-strategy-rts/widelands/DETAILS
index b3c7d57..545bf4c 100755
--- a/games-strategy-rts/widelands/DETAILS
+++ b/games-strategy-rts/widelands/DETAILS
@@ -1,25 +1,24 @@
SPELL=widelands
-if [ "$WIDELANDS_CVS" == "y" ]; then
- if [ "$WIDELANDS_CVS_AUTOUPDATE" == "y" ]; then
+if [[ "$WIDELANDS_SCM" == "y" ]]; then
+if [[ "$WIDELANDS_SCM_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
- SOURCE=${SPELL}-cvs.tar.bz2
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/widelands:widelands
+else
+ VERSION=scm
+fi
+ SOURCE=${SPELL}-svn.tar.bz2
+
SOURCE_URL[0]=svn_http://widelands.svn.sourceforge.net/svnroot/widelands/trunk:widelands-svn
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvs
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-svn
else
- VERSION=b9half
+ VERSION=build10
SOURCE=${SPELL}-${VERSION}-source.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+
SOURCE_HASH=sha512:75fca3f975dfc64f335ce73b8a1ddebe39335129e025c9124b1979b183d58632414ac89c1dcbbe33e84de8dc81bf057a88dfef264f846184e97d5ef9e6e4e7ab
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
fi
LICENSE[0]=GPL
WEB_SITE=http://wiki.widelands.org/tiki-index.php
- ENTERED=20040925
UPDATED=20040925
SHORT="a strategy game aiming for gameplay similar to Settlers"
cat << EOF
diff --git a/games-strategy-rts/widelands/HISTORY
b/games-strategy-rts/widelands/HISTORY
index ab58cf1..9397f96 100644
--- a/games-strategy-rts/widelands/HISTORY
+++ b/games-strategy-rts/widelands/HISTORY
@@ -1,3 +1,13 @@
+2007-04-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: uses scons now
+ * CONFIGURE: add more build targets
+ * DEPENDS: cvs -> svn, some depends updates
+ * DETAILS: version update and cvs -> svn change
+ * INSTALL: uses scons now
+ * PREPARE: changed to svn
+ * PRE_BUILD: modified to work with scons and our CXXFLAGS
+ * widelands: removed no longer needed
+
2006-09-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/games-strategy-rts/widelands/INSTALL
b/games-strategy-rts/widelands/INSTALL
index 2430066..1f0b784 100755
--- a/games-strategy-rts/widelands/INSTALL
+++ b/games-strategy-rts/widelands/INSTALL
@@ -1,15 +1,12 @@
-local INSTDIR=${INSTALL_ROOT}/usr/lib/games/widelands &&
-mkdir -p ${INSTDIR} &&
-cp -Rv campaigns ${INSTDIR} &&
-cp -Rv fonts ${INSTDIR} &&
-cp -Rv game_server ${INSTDIR} &&
-cp -Rv locale ${INSTDIR} &&
-cp -Rv maps ${INSTDIR} &&
-cp -Rv music ${INSTDIR} &&
-cp -Rv pics ${INSTDIR} &&
-cp -Rv sound ${INSTDIR} &&
-cp -Rv utils ${INSTDIR} &&
-cp -Rv tribes ${INSTDIR} &&
-cp -Rv worlds ${INSTDIR} &&
-cp -Rv widelands ${INSTDIR} &&
-cp -v ${SCRIPT_DIRECTORY}/widelands /usr/games
+WIDELANDS_GGZ=${WIDELANDS_GGZ/y/1} &&
+WIDELANDS_GGZ=${WIDELANDS_GGZ/n/0} &&
+utils/scons.py \
+ install_prefix=${INSTALL_ROOT}/usr \
+ build=${WIDELANDS_BUILD} \
+ use_ggz=${WIDELANDS_GGZ} \
+ install &&
+WIDELANDS_GGZ=${WIDELANDS_GGZ/1/y} &&
+WIDELANDS_GGZ=${WIDELANDS_GGZ/0/n} &&
+cd ${INSTALL_ROOT}/usr/share/games/widelands &&
+find_and_scam
+
diff --git a/games-strategy-rts/widelands/PREPARE
b/games-strategy-rts/widelands/PREPARE
index cd498e0..92b0ae0 100755
--- a/games-strategy-rts/widelands/PREPARE
+++ b/games-strategy-rts/widelands/PREPARE
@@ -1,7 +1,7 @@
-config_query WIDELANDS_CVS "Download latest cvs code?" n &&
+config_query WIDELANDS_SCM "Download latest scm code?" ${WIDELANDS_CVS:-n}
&&

-if [ "$WIDELANDS_CVS" == "y" ]; then
- config_query WIDELANDS_CVS_AUTOUPDATE \
- "Update to the latest CVS on every cast?" n
+if [[ "$WIDELANDS_SCM" == "y" ]]; then
+ config_query WIDELANDS_SCM_AUTOUPDATE \
+ "Update to the latest revision on every cast?"
${WIDELANDS_CVS_AUTOUPDATE:-n}
fi

diff --git a/games-strategy-rts/widelands/PRE_BUILD
b/games-strategy-rts/widelands/PRE_BUILD
index a4644a8..7abad10 100755
--- a/games-strategy-rts/widelands/PRE_BUILD
+++ b/games-strategy-rts/widelands/PRE_BUILD
@@ -1,19 +1,11 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-
-if [ "${WIDELANDS_BUILD}" == "debug" ]; then
- echo "BUILD:=debug" >> Makefile.local
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+disable_pic &&
+CXXFLAGS=${CXXFLAGS/-Os/-O2} &&
+sedit "256ienv.Append(CCFLAGS='${CXXFLAGS}')" SConstruct &&
+if [[ $WIDELANDS_SCM == y ]]; then
+sedit '354,+10d' build/scons-tools/scons_configure.py &&
+find ./ -name ".svn" -type d -print0 | xargs -0 rm -rf {}
else
- echo "BUILD:=release" >> Makefile.local
-fi &&
-
-if [ "${WIDELANDS_GGZ}" == "y" ]; then
- echo "USE_GGZ:=YES" >> Makefile.local
-fi &&
-
-if [ "${WIDELANDS_CVS}" == "y" ]; then
- for CVS_DIR in $(ls -lR * | grep "/CVS")
- do
- rm -rf "${CVS_DIR/:/}"
- done
+sedit '354,+9d' build/scons-tools/scons_configure.py
fi
diff --git a/games-strategy-rts/widelands/widelands
b/games-strategy-rts/widelands/widelands
deleted file mode 100755
index e919fd1..0000000
--- a/games-strategy-rts/widelands/widelands
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /usr/lib/games/widelands
-exec ./widelands "$@"
diff --git a/games-strategy-rts/widelands/widelands-b9half-source.tar.bz2.sig
b/games-strategy-rts/widelands/widelands-b9half-source.tar.bz2.sig
deleted file mode 100644
index bbe6983..0000000
Binary files
a/games-strategy-rts/widelands/widelands-b9half-source.tar.bz2.sig and
/dev/null differ



  • [SM-Commit] GIT changes to master games grimoire by Andraž Levstik (9cbf182ec6def0be336067f43a8120edb28d70a8), Andraž Levstik, 04/24/2007

Archive powered by MHonArc 2.6.24.

Top of Page