Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (3747861d6d28d39b978362c885d1caf0e519bd91)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (3747861d6d28d39b978362c885d1caf0e519bd91)
  • Date: Fri, 5 Oct 2007 16:37:06 -0500

GIT changes to master games grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 3 +++
games-simulation/vegastrike/BUILD | 5 ++---
games-simulation/vegastrike/DEPENDS | 7 +++++--
games-simulation/vegastrike/HISTORY | 5 +++++
games-simulation/vegastrike/INSTALL | 8 ++++++++
is_depends_enabled.function | 17 +++++++++++++++++
6 files changed, 40 insertions(+), 5 deletions(-)

New commits:
commit fb76a933ba14175fde99478e0136b87453dd058f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

games-simulation/vegastrike: added optional dependency on blender

commit 1b630dc48b05f0bd9abf87844b04c7510af6f858
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

added is_depends_enabled.function

diff --git a/ChangeLog b/ChangeLog
index 5327d6c..9078672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * is_depends_enabled.function: added.
+
2007-09-27 Alexander Tsamutali <astsmtl AT gmail.com>
* games-arcade-3d/extreme-tuxracer: new spell, racing game featuring
Tux
* games-simulation/crrcsim: new spell, a model-airplane flight
diff --git a/games-simulation/vegastrike/BUILD
b/games-simulation/vegastrike/BUILD
index 57cf8a3..0710544 100755
--- a/games-simulation/vegastrike/BUILD
+++ b/games-simulation/vegastrike/BUILD
@@ -8,6 +8,5 @@ OPTS="--enable-release --disable-debug $OPTS"
else
OPTS="--disable-release --enable-debug $OPTS"
fi
-OPTS="$VS_OPTS
--datadir=${INSTALL_ROOT}/usr/share/games/vegastrike/data$VERSION2 $OPTS"
-default_games_build &&
-make vssetup
+OPTS="$VS_OPTS --datadir=/usr/share/games/vegastrike/data${VERSION2} $OPTS"
+default_games_build
diff --git a/games-simulation/vegastrike/DEPENDS
b/games-simulation/vegastrike/DEPENDS
index 01031c5..847081a 100755
--- a/games-simulation/vegastrike/DEPENDS
+++ b/games-simulation/vegastrike/DEPENDS
@@ -23,5 +23,8 @@ optional_depends cegui \
"--disable-cegui" \
"Enable cegui"
fi &&
-depends -sub PYTHON boost "--with-boost=system"
-
+depends -sub PYTHON boost "--with-boost=system" &&
+optional_depends blender \
+ "" \
+ "" \
+ "install blender python scripts"
diff --git a/games-simulation/vegastrike/HISTORY
b/games-simulation/vegastrike/HISTORY
index 5899c71..2702fc0 100644
--- a/games-simulation/vegastrike/HISTORY
+++ b/games-simulation/vegastrike/HISTORY
@@ -1,3 +1,8 @@
+2007-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: removed code to build vssetup, it gets built by default
+ * DEPENDS, INSTALL: added optional dependency on blender,
+ install blender import scripts for vegastrike's 3D models
+
2007-08-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: use .tar.bz2 becasue else it won't work
* BUILD: remove some unenecessary if's
diff --git a/games-simulation/vegastrike/INSTALL
b/games-simulation/vegastrike/INSTALL
index 4511542..bf3c4f0 100755
--- a/games-simulation/vegastrike/INSTALL
+++ b/games-simulation/vegastrike/INSTALL
@@ -1,3 +1,4 @@
+. ${GRIMOIRE}/is_depends_enabled.function &&
mkdir -vp ${INSTALL_ROOT}/usr/share/games/vegastrike/data$VERSION2 &&
if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
install -v -o root -g games -m 0750 \
@@ -18,6 +19,13 @@ default_install
&&
mv ${INSTALL_ROOT}/usr/games/vegastrike \
${INSTALL_ROOT}/usr/games/vegastrike-bin &&
cp -v ${SPELL_DIRECTORY}/vsinstall ${INSTALL_ROOT}/usr/games &&
+if is_depends_enabled $SPELL blender; then
+ for i in import export; do
+ install -m 755 \
+ ${SOURCE_DIRECTORY}/$SPELL-svn/objconv/blender_xmesh_${i}.py \
+ ${INSTALL_ROOT}/usr/share/blender/scripts/${i}_xmesh.py
+ done
+fi
cd ${INSTALL_ROOT}/usr/share/games/vegastrike &&
find_and_scam &&
cat > ${INSTALL_ROOT}/usr/games/vegastrike << EOF
diff --git a/is_depends_enabled.function b/is_depends_enabled.function
new file mode 100644
index 0000000..6b54209
--- /dev/null
+++ b/is_depends_enabled.function
@@ -0,0 +1,17 @@
+#
+## This is here temporarily until is_depends_enabled is integrated to
+## stable sorcery. Before that this needs to be sourced by spells which
+## use is_depends_enabled.
+#
+if ! declare -f is_depends_enabled &>/dev/null; then
+ function is_depends_enabled() {
+ local dep_status
+ if [[ $3 ]] ; then
+ dep_status=$DEPENDS_STATUS
+ else
+ dep_status=$(hash_get uncommitted_hash $1)
+ [[ $dep_status ]] || dep_status=$DEPENDS_STATUS
+ fi
+ grep -q "^[[:space:]]*$1:$2:on" $dep_status
+ }
+fi



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (3747861d6d28d39b978362c885d1caf0e519bd91), Florian Franzmann, 10/05/2007

Archive powered by MHonArc 2.6.24.

Top of Page