Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (347909fc506064d7a48cc6a750a8d1bb9c953262)

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 grimoire by Florian Franzmann (347909fc506064d7a48cc6a750a8d1bb9c953262)
  • Date: Sat, 8 Jan 2011 13:23:58 -0600

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

gnustep-apps/gnustep-oolite/BUILD | 7 ++++++-
gnustep-apps/gnustep-oolite/CONFIGURE | 1 +
gnustep-apps/gnustep-oolite/DEPENDS | 9 +++++++--
gnustep-apps/gnustep-oolite/DETAILS | 13 +++++++++++--
gnustep-apps/gnustep-oolite/HISTORY | 4 ++++
gnustep-apps/gnustep-oolite/PRE_BUILD | 4 +++-
6 files changed, 32 insertions(+), 6 deletions(-)

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

gnustep-apps/gnustep-oolite: added optional support for the developer
version

diff --git a/gnustep-apps/gnustep-oolite/BUILD
b/gnustep-apps/gnustep-oolite/BUILD
index 51d9513..3cbeadf 100755
--- a/gnustep-apps/gnustep-oolite/BUILD
+++ b/gnustep-apps/gnustep-oolite/BUILD
@@ -1 +1,6 @@
-default_build debug=no
+if [[ $OOLITE_DEVEL == "y" ]]; then
+ . ${INSTALL_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh &&
+ make -f Makefile release || return 1
+else
+ default_build debug=no || return 1
+fi
diff --git a/gnustep-apps/gnustep-oolite/CONFIGURE
b/gnustep-apps/gnustep-oolite/CONFIGURE
new file mode 100755
index 0000000..94f1113
--- /dev/null
+++ b/gnustep-apps/gnustep-oolite/CONFIGURE
@@ -0,0 +1 @@
+config_query OOLITE_DEVEL "use development branch?" n
diff --git a/gnustep-apps/gnustep-oolite/DEPENDS
b/gnustep-apps/gnustep-oolite/DEPENDS
index 7db3a20..2da08e6 100755
--- a/gnustep-apps/gnustep-oolite/DEPENDS
+++ b/gnustep-apps/gnustep-oolite/DEPENDS
@@ -1,5 +1,10 @@
-depends gnustep-gui &&
depends sdl &&
depends sdl_image &&
depends sdl_mixer &&
-depends sdl_gfx
+depends sdl_gfx &&
+if [[ ${OOLITE_DEVEL} == "y" ]]; then
+ depends gnustep-base &&
+ suggest_depends espeak "" "" "support for spoken text" || return 1
+else
+ depends gnustep-gui || return 1
+fi
diff --git a/gnustep-apps/gnustep-oolite/DETAILS
b/gnustep-apps/gnustep-oolite/DETAILS
index 90f57d6..461db4f 100755
--- a/gnustep-apps/gnustep-oolite/DETAILS
+++ b/gnustep-apps/gnustep-oolite/DETAILS
@@ -1,4 +1,5 @@
SPELL=gnustep-oolite
+if [[ ${OOLITE_DEVEL} == "n" ]]; then
VERSION=1.65
SOURCE=oolite-$VERSION-src.tar.gz
SOURCE2=oolite-$VERSION-data.tar.gz
@@ -7,11 +8,19 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/oolite-$VERSION-src
SOURCE_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE}
SOURCE2_URL[0]=http://download.berlios.de/oolite-linux/${SOURCE2}
SOURCE2_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE2}
- WEB_SITE=http://oolite.aegidian.org/

SOURCE_HASH=sha512:d660e36d3679fadd7bcdb862db62c6d8eebd0bf10f68f17a16d2d83bf3570bee0c678fb9c5446158189f66d358e475c5ef1234b3b875a75091b497979c6d0135

SOURCE2_HASH=sha512:5d3ac8a42b4c0e46cf9a16da1bd8f32ceb730023d3b38fb3830d7031e44dfec92b465e8ae9e5a5815cd86c93540a17fedda324c42a9ebcae402ee412110b072e
+else
+ VERSION=1.74.2
+ SOURCE=oolite-dev-source-$VERSION.tar.bz2
+message "${MESSAGE_COLOR}SOURCE=${SOURCE}${DEFAULT_COLOR}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/oolite-dev-source-$VERSION
+ SOURCE_URL[0]=http://download.berlios.de/oolite-linux/${SOURCE}
+ SOURCE_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE}
+
SOURCE_HASH=sha512:39a2eeac1bab02c0fd0727d40282dcd0e64bbbaf971c06437b9cdbaa9a2a20498c644a4f59fb8d3d315779bbf55ade1175841179cd7159546302313c84d8ea40
+fi
+ WEB_SITE=http://oolite.aegidian.org/
LICENSE[0]="Creative Commons"
- LICENSE[1]="Creative Commons"
ENTERED=20060118
KEYWORDS="gnustep"
SHORT="Oolite is a space sim game."
diff --git a/gnustep-apps/gnustep-oolite/HISTORY
b/gnustep-apps/gnustep-oolite/HISTORY
index 366235b..3841590 100644
--- a/gnustep-apps/gnustep-oolite/HISTORY
+++ b/gnustep-apps/gnustep-oolite/HISTORY
@@ -1,3 +1,7 @@
+2011-01-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS, CONFIGURE, BUILD, INSTALL, PRE_BUILD:
+ added optional support for the developer version
+
2007-04-18 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update
* BUILD: added
diff --git a/gnustep-apps/gnustep-oolite/PRE_BUILD
b/gnustep-apps/gnustep-oolite/PRE_BUILD
index 0c43d68..0461df4 100755
--- a/gnustep-apps/gnustep-oolite/PRE_BUILD
+++ b/gnustep-apps/gnustep-oolite/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-unpack_file 2 &&
+if [[ $OOLITE_DEVEL == "n" ]]; then
+ unpack_file 2 || return 1
+fi &&
cd $SOURCE_DIRECTORY &&
sedit 's/shared_obj/obj/g' GNUmakefile.postamble



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (347909fc506064d7a48cc6a750a8d1bb9c953262), Florian Franzmann, 01/08/2011

Archive powered by MHonArc 2.6.24.

Top of Page