- updated version # to 3.3.6 in all Linux scripts

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])
 

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
+#	rm -r techs/megapack/factions/norsemen/upgrades/training_field
-fi
+#fi
 
 ./bin/glest.bin $@
 # ./bin/glest.bin $@ 2>&1 | tee -a /tmp/`date +"%F_%k-%M-%S"`.glest.log 2>&1

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
 

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="trunk"
-megaglest_release_folder="release-3.3.5.1"
+#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 data/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $INSTALLDATADIR ';'
-	find docs/ \( -name "*" \) -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 "*" \) -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 "*" \) -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 "*" \) -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 "*" \) -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 "*" \) -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 "*" \) -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

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";