Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (b9041a229ff273cba66f3df308384cf769a04dec)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Andraž 'ruskie' Levstik" <ruskie AT mages.ath.cx>
  • To: <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (b9041a229ff273cba66f3df308384cf769a04dec)
  • Date: Mon, 20 Aug 2007 21:19:06 +0200

On 20:54:37 2007-08-20 Florian Franzmann <scm AT sourcemage.org> wrote:
> GIT changes to master games grimoire by Florian Franzmann
> <siflfran AT hawo.stw.uni-erlangen.de>:
>
> games-simulation/vegastrike/BUILD | 24 +++---------------
> games-simulation/vegastrike/DEPENDS | 17 ++++++++-----
> games-simulation/vegastrike/DETAILS | 32 +++++++++++++-----------
> games-simulation/vegastrike/DOWNLOAD | 44
> ++++++++++++++++++++++++++++++++++ games-simulation/vegastrike/HISTORY
> | 10 +++++++ games-simulation/vegastrike/INSTALL | 38
> ++++++----------------------- games-simulation/vegastrike/PREPARE |
> 6 ++++ games-simulation/vegastrike/PRE_BUILD | 19 ++++++++------
> 8 files changed, 112 insertions(+), 78 deletions(-)
>
> New commits:
> commit b9041a229ff273cba66f3df308384cf769a04dec
> Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
> Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
>
> games-simulation/vegastrike: switched to subversion
>
> diff --git a/games-simulation/vegastrike/BUILD
> b/games-simulation/vegastrike/BUILD index a060f58..589e9be 100755
> --- a/games-simulation/vegastrike/BUILD
> +++ b/games-simulation/vegastrike/BUILD
> @@ -1,20 +1,6 @@
> cd ${SPELL} &&
> -aclocal &&
> -autoconf &&
> -autoheader &&
> -automake -a &&
> -
> -./configure --prefix=${INSTALL_ROOT}/usr
> \ - --sysconfdir=${INSTALL_ROOT}/etc
> \ - --localstatedir=${INSTALL_ROOT}/var
> \ - --mandir=${INSTALL_ROOT}/usr/share/man
> \ - --infodir=${INSTALL_ROOT}/usr/share/info
> \ - --datadir=${INSTALL_ROOT}/usr/share/games/vegastrike/data \
> - --bindir=${INSTALL_ROOT}/usr/games
> \ - --enable-release
> \ - $OPTS
> && -
> -make &&
> -cd ../vssetup/src &&
> -perl ./build &&
> -cd ../../


Great... BUT...

> +OPTS="--enable-release --disable-debug $OPTS"

Provide an option for either release or debug using a list like:

config_query_list VS_BUILD "What type of build? release debug
then base on that... Or just ask for debug and if no build release

> +OPTS="--enable-stencil-buffer $OPTS"

Shouldn't these be optional?

> +OPTS="--datadir=/usr/share/games/vegastrike/data4.x $OPTS"
> +default_games_build &&
> +make vssetup
> diff --git a/games-simulation/vegastrike/DEPENDS
> b/games-simulation/vegastrike/DEPENDS index aa00c5c..92375bf 100755
> --- a/games-simulation/vegastrike/DEPENDS
> +++ b/games-simulation/vegastrike/DEPENDS
> @@ -1,7 +1,12 @@
> -depends GLUT &&
> -depends python &&
> -depends sdl &&
> -depends libpng &&
> -depends jpeg &&
> -depends perl &&
> +depends SVN &&
> +depends automake &&
> +depends autoconf &&
> +depends expat &&
> +depends gtk+2 &&
> +depends GLUT &&
> +depends python &&
> +depends sdl &&
> +depends libpng &&
> +depends jpeg &&
> +depends perl &&
> depends openal
> diff --git a/games-simulation/vegastrike/DETAILS
> b/games-simulation/vegastrike/DETAILS index f6666aa..5f5d7a6 100755
> --- a/games-simulation/vegastrike/DETAILS
> +++ b/games-simulation/vegastrike/DETAILS
> @@ -1,22 +1,24 @@
> SPELL=vegastrike
> - VERSION=0.4.3
> - SOURCE=$SPELL-$VERSION.tar.bz2
> - SOURCE2=$SPELL-$VERSION-data.tar.bz2
> - SOURCE3=$SPELL-$VERSION-vssetup.tar.bz2
> - SOURCE4=$SPELL-$VERSION-music.tar.bz2
> +if [[ $VEGASTRIKE_DEVEL == "n" ]]; then
> + VERSION="0_4_3"
> + SOURCE=$SPELL-$VERSION-vegastrike.tar
> + SOURCE2=$SPELL-$VERSION-data4.x.tar
> +else
> + if [[ $VEGASTRIKE_UPDATE == "y" ]]; then
> + VERSION=$(date +%Y-%m-%d)
> + else
> + VERSION=svn
> + fi
> + SOURCE=$SPELL-svn-vegastrike.tar
> + SOURCE2=$SPELL-svn-data4.x.tar
> +fi
> SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
> -
> SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/vegastrike:vegastrike:vegastrike_0_4_3

> -
> SOURCE2_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/vegastrike:data4.x:vegastrike_0_4_3

> -
> SOURCE3_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/vegastrike:vssetup

> -
> SOURCE4_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/vegastrike:music

> - SOURCE_IGNORE=unversioned
> - SOURCE2_IGNORE=unversioned
> - SOURCE3_IGNORE=unversioned
> - SOURCE4_IGNORE=unversioned
> +
> VEGASTRIKE_SVN="https://vegastrike.svn.sourceforge.net/svnroot/vegastrike";


> + SOURCE_IGNORE=volatile
> + SOURCE2_IGNORE=volatile
> WEB_SITE=http://vegastrike.sourceforge.net/
> ENTERED=20040502
> - UPDATED=20040502
> -
> LICENSE[0]=http://vegastrike.sourceforge.net/manual/33_license/index.html

> + LICENSE[0]=GPL
> SHORT="3D Space Simulator."
> cat << EOF
> Vega Strike is a 3D Space Simulator that allows you to trade and
> bounty hunt in a diff --git a/games-simulation/vegastrike/DOWNLOAD
> b/games-simulation/vegastrike/DOWNLOAD new file mode 100755
> index 0000000..8d675ba
> --- /dev/null
> +++ b/games-simulation/vegastrike/DOWNLOAD
> @@ -0,0 +1,44 @@
> +local success
> +mkdir $TMP_DIR/${SOURCE_DIRECTORY/$BUILD_DIRECTORY\//} &&
> +cd $TMP_DIR &&
> +cd ${SOURCE_DIRECTORY/$BUILD_DIRECTORY\//} &&
> +for module in vegastrike data4.x;
> +do
> + if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
> + local sourcefile=$SPELL-svn-$module.tar
> + else
> + local sourcefile=$SPELL-$VERSION-$module.tar
> + fi &&
> +
> + if [[ $FORCE_DOWNLOAD ]]; then
> + rm -f $SOURCE_CACHE/$sourcefile
> + fi &&
> +
> + if [[ -f $SOURCE_CACHE/$sourcefile ]]; then
> + message "${MESSAGE_COLOR}extracting old tarball in
> $TMP_DIR${DEFAULT_COLOR}" && + tar -xf $SOURCE_CACHE/$sourcefile
> && + cd $module
> && + message "${MESSAGE_COLOR}running svn
> update${DEFAULT_COLOR}" && + svn up || return 1
> + else
> + message "${MESSAGE_COLOR}creating new tarball${DEFAULT_COLOR}"
> && + message "${MESSAGE_COLOR}running svn checkout for module
> $module${DEFAULT_COLOR}" && + if [[ $VEGASTRIKE_DEVEL == "y" ]];
> then + svn co $VEGASTRIKE_SVN/trunk/$module $module ||
> + return 1
> + else
> + svn co $VEGASTRIKE_SVN/tags/vegastrike_$VERSION/$module ||
> + return 1
> + fi
> + fi &&
> + message "${MESSAGE_COLOR}creating source tarball $sourcefile for
> module $module${DEFAULT_COLOR}" && + cd
> $TMP_DIR/${SOURCE_DIRECTORY/$BUILD_DIRECTORY\//} && + tar
> -cf $sourcefile $module && + mv
> $sourcefile $SOURCE_CACHE && +
> success="Yeah!" +done &&
> +if [[ -z $success ]] ; then
> + return 1
> +else
> + return 0
> +fi


Remove DOWNLOAD and just put into the svn url the following:

SOURCE_URL=svn://vegastrike.svn.sourceforge.net/svnroot/vegastrike
SOURCE_HINTS=old_svn_compat

> diff --git a/games-simulation/vegastrike/HISTORY
> b/games-simulation/vegastrike/HISTORY index 86ff42a..a713978 100644
> --- a/games-simulation/vegastrike/HISTORY
> +++ b/games-simulation/vegastrike/HISTORY
> @@ -1,3 +1,13 @@
> +2007-08-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
> + * BUILD, DETAILS, DEPENDS, INSTALL,
> + PRE_BUILD, DOWNLOAD, PREPARE: switched to svn,
> + the project has been using it for quite some time
> + now and the cvs repository doesn't exist anymore.
> + Added an option to build the development version.
> + The way the source is fetched in DOWNLOAD is a
> + mess, if anyone has a better idea at how to do
> + this please implement it...
> +
> 2006-09-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
> * DETAILS: [automated] Removed BUILD_API=2.
>
> diff --git a/games-simulation/vegastrike/INSTALL
> b/games-simulation/vegastrike/INSTALL index 6d2420e..7700edd 100755
> --- a/games-simulation/vegastrike/INSTALL
> +++ b/games-simulation/vegastrike/INSTALL
> @@ -1,31 +1,9 @@
> -cd data &&
> -cp ../vssetup/src/bin/setup ./vssetup &&
> -cp ../vegastrike/src/vegastrike . &&
> -cp ../vegastrike/src/networking/soundserver . &&
> -cp ../vegastrike/launcher/vslauncher . &&
> -
> -mkdir -p ${INSTALL_ROOT}/usr/games &&
> -install -m 755 ./vssetup ${INSTALL_ROOT}/usr/games/vssetup &&
> -install -m 755 ./vegastrike ${INSTALL_ROOT}/usr/games/vegastrike &&
> -install -m 755 ./vslauncher ${INSTALL_ROOT}/usr/games/vslauncher &&
> -
> -mkdir -p /usr/share/man/man1 &&
> -install -m 644 documentation/vegastrike.1 \
> -${INSTALL_ROOT}/usr/share/man/man1/vegastrike.1 &&
> -install -m 644 documentation/vslauncher.1 \
> -${INSTALL_ROOT}/usr/share/man/man1/vslauncher.1 &&
> -install -m 644 documentation/vssetup.1 \
> -${INSTALL_ROOT}/usr/share/man/man1/vssetup.1 &&
> -
> -cd .. &&
> +local INSTALL="install -o root -g games"
> mkdir -p ${INSTALL_ROOT}/usr/share/games/vegastrike &&
> -cp -ar data ${INSTALL_ROOT}/usr/share/games/vegastrike &&
> -
> -install -m 755 ${SCRIPT_DIRECTORY}/vsinstall \
> -${INSTALL_ROOT}/usr/games/vsinstall &&
> -
> -#stupid hack to let the soft know where the data are at runtime.
> -#and I know the ident suck but I wasn't sure I could cut in the
> -#middle of a sed.
> -sedit '393i\ \t\t\t<var name="datadir"
> value="/usr/share/games/vegastrike/data"/>' \

> -${INSTALL_ROOT}/usr/share/games/vegastrike/data/vegastrike.config
> +cp -R ${SOURCE_DIRECTORY}/data4.x \
> + ${INSTALL_ROOT}/usr/share/games/vegastrike/data4.x &&
> +$INSTALL -m 755 ${SOURCE_DIRECTORY}/vegastrike/vssetup \
> + ${INSTALL_ROOT}/usr/games &&
> +cd ${SOURCE_DIRECTORY}/vegastrike &&
> +default_install &&
> +$INSTALL $SCRIPT_DIRECTORY/vsinstall $INSTALL_ROOT/usr/games
> diff --git a/games-simulation/vegastrike/PREPARE
> b/games-simulation/vegastrike/PREPARE new file mode 100755
> index 0000000..7092d1a
> --- /dev/null
> +++ b/games-simulation/vegastrike/PREPARE
> @@ -0,0 +1,6 @@
> +config_query VEGASTRIKE_DEVEL \
> + "Do you want the development version?" y &&
> +if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
> + config_query VEGASTRIKE_UPDATE \
> + "Automatically update $SPELL on system-update?" n
> +fi
> diff --git a/games-simulation/vegastrike/PRE_BUILD
> b/games-simulation/vegastrike/PRE_BUILD index e5d9c31..ca5102c 100755
> --- a/games-simulation/vegastrike/PRE_BUILD
> +++ b/games-simulation/vegastrike/PRE_BUILD
> @@ -1,10 +1,13 @@
> mk_source_dir $SOURCE_DIRECTORY &&
> cd $SOURCE_DIRECTORY &&
> -unpack_file &&
> -mv $SPELL-$VERSION $SPELL &&
> -unpack_file 2 &&
> -mv $SPELL-$VERSION-data data &&
> -unpack_file 3 &&
> -mv $SPELL-$VERSION-vssetup vssetup &&
> -unpack_file 4 &&
> -mv $SPELL-$VERSION-music data/music
> +unpack_file &&
> +unpack_file 2 &&
> +cd ${SOURCE_DIRECTORY}/vegastrike &&
> +if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
> + ./bootstrap-sh
> +else
> + aclocal &&
> + autoconf -f &&
> + autoheader -f &&
> + automake -acf
> +fi
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit


--
Andraž "ruskie" Levstik
Source Mage GNU/Linux Games grimoire guru
Geek/Hacker/Tinker

Hacker FAQ: http://www.plethora.net/%7eseebs/faqs/hacker.html
Be sure brain is in gear before engaging mouth.

Key id = F4C1F89C
Key fingerprint = 6FF2 8F20 4C9D DB36 B5B6 F134 884D 72CC F4C1 F89C





Archive powered by MHonArc 2.6.24.

Top of Page