- updated scripts as well as cmake so that source and data build both together and separate from in an svn tree or the sf tarballs

CMakeLists.txt

@@ -177,28 +177,28 @@ IF(WIN32)
 ENDIF()
 
 # Check if sources exist
-IF(EXISTS "source/")
+IF(EXISTS "${PROJECT_SOURCE_DIR}/source/")
 	MESSAGE(STATUS "**Found game source code.")
 
-	ADD_SUBDIRECTORY( source/shared_lib )
-	ADD_SUBDIRECTORY( source/glest_game )
+	ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/shared_lib )
+	ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_game )
 	#if(wxWidgets_FOUND)
-	  ADD_SUBDIRECTORY( source/glest_map_editor )
-	  ADD_SUBDIRECTORY( source/g3d_viewer )
-	  ADD_SUBDIRECTORY( source/configurator )
+	  ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_map_editor )
+	  ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/g3d_viewer )
+	  ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/configurator )
 	#else()
 	#  MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine")
 	#  MESSAGE(STATUS "map editor, g3d viewer, configurator")
 	#endif()
-	ADD_SUBDIRECTORY( source/tools/glexemel )
+	ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tools/glexemel )
 
 	IF(APPLE)
-		include(mk/macosx/CMakeLists.txt)
+		include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt)
 	ENDIF(APPLE)
 ENDIF()
 
 # Check if data exist
-IF(EXISTS "data/glest_game/")
+IF(EXISTS "${PROJECT_SOURCE_DIR}/data/glest_game/")
         MESSAGE(STATUS "**Found game data.")
-	ADD_SUBDIRECTORY( data/glest_game )
+	ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/data/glest_game )
 ENDIF()

mk/linux/makedata.sh

@@ -2,20 +2,34 @@
 
 VERSION=`./mg-version.sh --version`
 RELEASENAME=megaglest-data
-RELEASEDIR="`pwd`/release/$RELEASENAME-$VERSION"
+#RELEASEDIR="`pwd`/release/$RELEASENAME-$VERSION"
+RELEASEDIR="`pwd`/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
 
 echo "Creating data package in $RELEASEDIR"
 
 rm -rf $RELEASEDIR
 mkdir -p $RELEASEDIR
-# copy sources
+
+# copy data
+pushd "`pwd`/../../mk/linux"
+echo '----In mk/linux'
+find megaglest.bmp \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
+find megaglest.desktop \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
+find megaglest.png \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
+popd
+#ls $RELEASEDIR
+
+# copy data
 pushd "`pwd`/../../data/glest_game"
+echo '----In data/glest_game'
+
 find megaglest.ico \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find g3dviewer.ico \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find editor.ico \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
-find megaglest.bmp \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find servers.ini \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
+find glest.ini \( -name "*" \) -exec cp -p "{}" $RELEASEDIR/glest_linux.ini ';'
 find glestkeys.ini \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
+
 find data/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find docs/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find maps/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
@@ -23,6 +37,8 @@ find scenarios/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~"
 find techs/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find tilesets/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find tutorials/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
+
+cp -p ../../CMake* $RELEASEDIR
 popd
 
 pushd $RELEASEDIR
@@ -35,7 +51,9 @@ popd
 pushd release
 PACKAGE="$RELEASENAME-$VERSION.7z"
 echo "creating $PACKAGE"
+rm "$PACKAGE"
+
+#pushd $RELEASEDIR
+7za a -mx=9 -ms=on -mhc=on "$PACKAGE" "$RELEASENAME-$VERSION"
 
-pushd $RELEASEDIR
-7za a -mx=9 -ms=on -mhc=on "../$PACKAGE" *
 popd

mk/linux/makerelease.sh

@@ -2,7 +2,8 @@
 
 VERSION=`./mg-version.sh --version`
 RELEASENAME=megaglest-source
-RELEASEDIR="`pwd`/release/$RELEASENAME-$VERSION"
+#RELEASEDIR="`pwd`/release/$RELEASENAME-$VERSION"
+RELEASEDIR="`pwd`/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
 
 echo "Creating source package in $RELEASEDIR"
 
@@ -26,7 +27,7 @@ popd
 
 popd
 
-cp -p ../../docs/readme*.txt ../../docs/*license*.txt $RELEASEDIR
+cp -p ../../docs/*.txt $RELEASEDIR
 cp -p glest.ini $RELEASEDIR
 cp -p glestkeys.ini $RELEASEDIR
 cp -p servers.ini $RELEASEDIR
@@ -39,13 +40,11 @@ cp -p start_megaglest_mapeditor $RELEASEDIR
 cp -p start_megaglest_g3dviewer $RELEASEDIR
 cp -p ../../CMake* $RELEASEDIR
 
-pushd $RELEASEDIR
-#./autogen.sh
-popd
-
 pushd release
 PACKAGE="$RELEASENAME-$VERSION.tar.bz2"
 echo "creating $PACKAGE"
+rm "$PACKAGE"
+
 tar -c --bzip2 -f "$PACKAGE" "$RELEASENAME-$VERSION"
 #7za a "$RELEASENAME-$VERSION.7z" "$RELEASENAME-$VERSION"
 popd

mk/linux/mg-version.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-OLD_MG_VERSION=3.4.0
-MG_VERSION=3.5.0
+OLD_MG_VERSION=3.5.0
+MG_VERSION=3.5.1
 
 if [ "$1" = "--oldversion" ]; then
   echo "$OLD_MG_VERSION"

mk/linux/mojosetup/megaglest-installer/scripts/config.lua

@@ -1,5 +1,5 @@
 local GAME_INSTALL_SIZE = 680000000;
-local GAME_VERSION = "3.5.0";
+local GAME_VERSION = "3.5.1";
 
 local _ = MojoSetup.translate
 
@@ -71,13 +71,13 @@ Setup.Package
     Setup.Eula
     {
         description = _("Megaglest License"),
-        source = _("docs/LICENSE")
+        source = _("docs/README.data-license.txt")
     },
 
     Setup.Readme
     {
         description = _("Megaglest README"),
-        source = _("docs/README")
+        source = _("docs/README.txt")
     },
 
     Setup.Option