From f176cfff117042608ccc5d684aa54ead8512c6f1 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 12 Aug 2010 00:08:10 +0000 Subject: [PATCH] - updated version # to 3.3.6 in all Linux scripts --- mk/linux/configure.ac | 2 +- mk/linux/glest | 6 +++--- mk/linux/makedata-diff.sh | 2 +- .../mojosetup/megaglest-installer/make.sh | 21 ++++++++++--------- source/glest_game/facilities/game_util.cpp | 2 +- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/mk/linux/configure.ac b/mk/linux/configure.ac index 06758c01..95b9df7b 100644 --- a/mk/linux/configure.ac +++ b/mk/linux/configure.ac @@ -4,7 +4,7 @@ #---------------------------------------------------------------------------- AC_PREREQ([2.54]) -AC_INIT([megaglest], [3.3.5.1], [matze@braunis.de]) +AC_INIT([megaglest], [3.3.6], [matze@braunis.de]) AC_CONFIG_SRCDIR([mk/jam/build.jam]) AC_CONFIG_AUX_DIR([mk/autoconf]) diff --git a/mk/linux/glest b/mk/linux/glest index fb6df7d8..8231939c 100755 --- a/mk/linux/glest +++ b/mk/linux/glest @@ -136,10 +136,10 @@ findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DIRECTFB_LINKEDLIBNAME}" "$DIRECTF findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${FUSION_LINKEDLIBNAME}" "$FUSION_LIBLOOKUP1" "$FUSION_LIBLOOKUP2" findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DIRECT_LINKEDLIBNAME}" "$DIRECT_LIBLOOKUP1" "$DIRECT_LIBLOOKUP2" -if [ -d techs/megapack/factions/norsemen/upgrades/training_field ]; then +#if [ -d techs/megapack/factions/norsemen/upgrades/training_field ]; then # removed as of 3.3.5.1 beta1 - rm -r techs/megapack/factions/norsemen/upgrades/training_field -fi +# rm -r techs/megapack/factions/norsemen/upgrades/training_field +#fi ./bin/glest.bin $@ # ./bin/glest.bin $@ 2>&1 | tee -a /tmp/`date +"%F_%k-%M-%S"`.glest.log 2>&1 diff --git a/mk/linux/makedata-diff.sh b/mk/linux/makedata-diff.sh index 93c85e53..32b59e2e 100755 --- a/mk/linux/makedata-diff.sh +++ b/mk/linux/makedata-diff.sh @@ -5,7 +5,7 @@ # Below is the old version to compare with. The new version is pulled from # configure.ac -OLD_VERSION=3.3.4 +OLD_VERSION=3.3.5 cd release diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh index 50d3e3c3..b91be3b3 100755 --- a/mk/linux/mojosetup/megaglest-installer/make.sh +++ b/mk/linux/mojosetup/megaglest-installer/make.sh @@ -6,8 +6,8 @@ # below is the branch to build and installer from -#megaglest_release_folder="trunk" -megaglest_release_folder="release-3.3.5.1" +megaglest_release_folder="trunk" +#megaglest_release_folder="release-3.3.5.1" # below describe various folder paths relative to the installer root folder megaglest_project_root=../../../../../ @@ -152,14 +152,14 @@ if [ $REPACKONLY -eq 0 ]; then find megaglest.ico -exec cp -p --parents "{}" $INSTALLDATADIR ';' find g3dviewer.ico -exec cp -p --parents "{}" ${INSTALLDATADIR} ';' find editor.ico -exec cp -p --parents "{}" ${INSTALLDATADIR} ';' - find data/ \( -name "*" \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' - find docs/ \( -name "*" \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' - find maps/ \( -name "*" \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' - find scenarios/ \( -name "*" \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' - find screens/ \( -name "*" \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' - find techs/ \( -name "*" \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' - find tilesets/ \( -name "*" \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' - find tutorials/ \( -name "*" \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' + find data/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' + find docs/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' + find maps/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' + find scenarios/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' + find screens/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' + find techs/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' + find tilesets/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' + find tutorials/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $INSTALLDATADIR ';' popd @@ -168,6 +168,7 @@ if [ $REPACKONLY -eq 0 ]; then find data/ -name "\.svn" -type d -depth -exec rm -rf {} \; find data/ -name "*~" -exec rm -rf {} \; + find data/ -name "*.bak" -exec rm -rf {} \; # Copy shared lib dependencies for glest.bin cd data diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index 0f462e4d..2d19617b 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/glest_game/facilities/game_util.cpp @@ -26,7 +26,7 @@ using namespace Shared::Platform; namespace Glest{ namespace Game{ const string mailString= "contact_game@glest.org"; -const string glestVersionString= "v3.3.5.1-beta2"; +const string glestVersionString= "v3.3.6"; string getCrashDumpFileName(){ return "glest" + glestVersionString + ".dmp";