From fd9147440ecf216a5e428a96f791b11e5292f698 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Tue, 20 Dec 2011 05:32:18 +0000
Subject: [PATCH] - fixed release build scripts to proper separate embedded
 source and data

---
 mk/linux/makedata.sh             | 9 +++++++--
 mk/linux/makerelease-embedded.sh | 6 ++++++
 mk/linux/makerelease.sh          | 7 +++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/mk/linux/makedata.sh b/mk/linux/makedata.sh
index f4b59539..7607b4c9 100755
--- a/mk/linux/makedata.sh
+++ b/mk/linux/makedata.sh
@@ -50,11 +50,16 @@ mkdir -p "$RELEASEDIR/tutorials/"
 svn export --force "$CURRENTDIR/../../data/glest_game/tutorials" "$RELEASEDIR/tutorials/"
 
 # special export for flag images
-mkdir -p "$RELEASEDIR/data/core/misc_textures/flags/"
-svn export --force "$CURRENTDIR/../../source/masterserver/flags" "$RELEASEDIR/data/core/misc_textures/flags/"
+# mkdir -p "$RELEASEDIR/data/core/misc_textures/flags/"
+# svn export --force "$CURRENTDIR/../../source/masterserver/flags" "$RELEASEDIR/data/core/misc_textures/flags/"
 
 svn export --force "$CURRENTDIR/../../data/glest_game/CMakeLists.txt" "$RELEASEDIR/CMakeLists.txt"
 
+# START
+# remove embedded data
+rm -rf "$RELEASEDIR/data/core/fonts"
+# END
+
 echo "creating $PACKAGE"
 [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
 #tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/" "$RELEASENAME-$VERSION"
diff --git a/mk/linux/makerelease-embedded.sh b/mk/linux/makerelease-embedded.sh
index d9409dcb..5ea3a7ad 100755
--- a/mk/linux/makerelease-embedded.sh
+++ b/mk/linux/makerelease-embedded.sh
@@ -32,6 +32,12 @@ svn export --force "$SOURCEDIR/shared_lib/include/platform/miniupnpc" "$RELEASED
 #svn export --force "$SOURCEDIR/shared_lib/sources/streflop" "$RELEASEDIR/source/shared_lib/sources/streflop"
 #svn export --force "$SOURCEDIR/shared_lib/include/streflop" "$RELEASEDIR/source/shared_lib/include/streflop"
 
+mkdir -p "$RELEASEDIR/source/masterserver/flags/"
+svn export --force "$SOURCEDIR/masterserver/flags" "$RELEASEDIR/source/masterserver/flags"
+
+mkdir -p "$RELEASEDIR/data/core/fonts/"
+svn export --force "$SOURCEDIR/../data/glest_game/data/core/fonts" "$RELEASEDIR/data/core/fonts"
+
 echo "Creating $PACKAGE"
 [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
 tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/$RELEASENAME-$VERSION" "megaglest-$VERSION"
diff --git a/mk/linux/makerelease.sh b/mk/linux/makerelease.sh
index b763f5af..099a7307 100755
--- a/mk/linux/makerelease.sh
+++ b/mk/linux/makerelease.sh
@@ -50,13 +50,16 @@ svn export --force "$CURRENTDIR/start_megaglest_g3dviewer" $RELEASEDIR/start_meg
 svn export --force "$CURRENTDIR/start_megaglest_mapeditor" $RELEASEDIR/start_megaglest_mapeditor
 svn export --force "$CURRENTDIR/../../CMakeLists.txt" $RELEASEDIR/CMakeLists.txt
 
+# START
 # remove embedded library code as that will be packaged in a seperate archive
 rm -rf "$RELEASEDIR/source/shared_lib/sources/libircclient/"
 rm -rf "$RELEASEDIR/source/shared_lib/include/libircclient/"
 rm -rf "$RELEASEDIR/source/shared_lib/sources/platform/miniupnpc/"
 rm -rf "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc/"
-#rm -rf "$RELEASEDIR/source/shared_lib/sources/streflop/"
-#rm -rf "$RELEASEDIR/source/shared_lib/include/streflop/"
+# rm -rf "$RELEASEDIR/source/shared_lib/sources/streflop/"
+# rm -rf "$RELEASEDIR/source/shared_lib/include/streflop/"
+rm -rf "$RELEASEDIR/source/masterserver/flags/"
+# END
 
 echo "Creating $PACKAGE"
 [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"