From 7b7a5943595741a19bfc97fb3831bd9df8fbc29f Mon Sep 17 00:00:00 2001
From: SoftCoder <mark_vejvoda@hotmail.com>
Date: Fri, 27 Dec 2013 21:58:29 -0800
Subject: [PATCH] - updated some release scripts to use git instead of svn

---
 mk/linux/make-data-archive.sh    |  53 ++++++++++++---
 mk/linux/makedata-source.sh      |  16 +++--
 mk/linux/makedata.sh             | 109 ++++++++++++++++++++++++-------
 mk/linux/makerelease-embedded.sh |  26 ++++++--
 mk/linux/makerelease.sh          |  96 +++++++++++++++++++--------
 5 files changed, 229 insertions(+), 71 deletions(-)

diff --git a/mk/linux/make-data-archive.sh b/mk/linux/make-data-archive.sh
index d1017284..bdbb713b 100755
--- a/mk/linux/make-data-archive.sh
+++ b/mk/linux/make-data-archive.sh
@@ -15,6 +15,7 @@ CURRENTDIR="$(dirname $(readlink -f $0))"
 #RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
 RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION"
 PROJDIR="$CURRENTDIR/../../"
+REPODIR="$CURRENTDIR/../../"
 
 echo "Creating data package in $RELEASEDIR"
 
@@ -38,25 +39,56 @@ echo "copying data ..."
 #svn export --force "$CURRENTDIR/../../data/glest_game/glestkeys.ini" "$RELEASEDIR/glestkeys.ini"
 
 mkdir -p "$RELEASEDIR/data/"
-svn export --force "$CURRENTDIR/../../data/glest_game/data" "$RELEASEDIR/data/"
+cd "$RELEASEDIR/data/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/data" "$RELEASEDIR/data/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:data | tar x
+
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/docs/"
-svn export --force "$CURRENTDIR/../../data/glest_game/docs" "$RELEASEDIR/docs/"
-svn export --force "$CURRENTDIR/../../docs/CHANGELOG.txt" "$RELEASEDIR/docs/CHANGELOG.txt"
-svn export --force "$CURRENTDIR/../../docs/README.txt" "$RELEASEDIR/docs/README.txt"
+cd "$RELEASEDIR/docs/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/docs" "$RELEASEDIR/docs/"
+#svn export --force "$CURRENTDIR/../../docs/CHANGELOG.txt" "$RELEASEDIR/docs/CHANGELOG.txt"
+#svn export --force "$CURRENTDIR/../../docs/README.txt" "$RELEASEDIR/docs/README.txt"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:docs | tar x
+git archive --remote ${REPODIR} HEAD:docs/ CHANGELOG.txt | tar x
+git archive --remote ${REPODIR} HEAD:docs/ README.txt | tar x
+
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/maps/"
-svn export --force "$CURRENTDIR/../../data/glest_game/maps" "$RELEASEDIR/maps/"
+cd "$RELEASEDIR/maps/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/maps" "$RELEASEDIR/maps/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:maps | tar x
+
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/scenarios/"
-svn export --force "$CURRENTDIR/../../data/glest_game/scenarios" "$RELEASEDIR/scenarios/"
+cd "$RELEASEDIR/scenarios/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/scenarios" "$RELEASEDIR/scenarios/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:scenarios | tar x
+
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/techs/"
-svn export --force "$CURRENTDIR/../../data/glest_game/techs" "$RELEASEDIR/techs/"
+cd "$RELEASEDIR/techs/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/techs" "$RELEASEDIR/techs/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:techs | tar x
+
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/tilesets/"
-svn export --force "$CURRENTDIR/../../data/glest_game/tilesets" "$RELEASEDIR/tilesets/"
+cd "$RELEASEDIR/tilesets/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/tilesets" "$RELEASEDIR/tilesets/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:tilesets | tar x
+
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/tutorials/"
-svn export --force "$CURRENTDIR/../../data/glest_game/tutorials" "$RELEASEDIR/tutorials/"
+cd "$RELEASEDIR/tutorials/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/tutorials" "$RELEASEDIR/tutorials/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:tutorials | tar x
 
 # special export for flag images
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/data/core/misc_textures/flags/"
-svn export --force "$CURRENTDIR/../../source/masterserver/flags" "$RELEASEDIR/data/core/misc_textures/flags/"
+cd "$RELEASEDIR/data/core/misc_textures/flags/"
+# svn export --force "$CURRENTDIR/../../source/masterserver/flags" "$RELEASEDIR/data/core/misc_textures/flags/"
+git archive --remote ${REPODIR}/source/masterserver/ HEAD:flags | tar x
 
 #svn export --force "$CURRENTDIR/../../data/glest_game/CMakeLists.txt" "$RELEASEDIR/CMakeLists.txt"
 
@@ -65,6 +97,7 @@ svn export --force "$CURRENTDIR/../../source/masterserver/flags" "$RELEASEDIR/da
 #rm -rf "$RELEASEDIR/data/core/fonts"
 # END
 
+cd "$CURRENTDIR"
 echo "creating data archive: $PACKAGE"
 [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
 #tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/" "$RELEASENAME-$VERSION"
diff --git a/mk/linux/makedata-source.sh b/mk/linux/makedata-source.sh
index 3f5b22c7..52a43032 100755
--- a/mk/linux/makedata-source.sh
+++ b/mk/linux/makedata-source.sh
@@ -14,6 +14,7 @@ PACKAGE="$RELEASENAME-$VERSION.tar.xz"
 CURRENTDIR="$(dirname $(readlink -f $0))"
 RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
 SOURCEDIR="$CURRENTDIR/../../source/"
+REPODIR="$CURRENTDIR/../../../git-data-source/"
 
 echo "Creating data package in $RELEASEDIR"
 
@@ -22,17 +23,22 @@ mkdir -p "$RELEASEDIR"
 
 project_parent_dir="$(basename $(readlink -f -- "$(dirname -- "$0")/../../") )"
 # echo "$project_parent_dir"
-if [[ $project_parent_dir == trunk* ]] ;
+if [[ $project_parent_dir == git* ]] ;
 then
-    	echo 'this is the trunk!'
+    	echo 'This is the master branch'
 else
-	echo '*NOTE: This script currently only works on the trunk, aborting!'
+	echo '*NOTE: This script currently only works on the master HEAD, aborting!'
 	exit
 fi
 
-# copy data
-svn export --force "$CURRENTDIR/../../../trunk-data-source" "$RELEASEDIR/data-source/"
 
+# copy data
+mkdir -p "$RELEASEDIR/data-source"
+cd "$RELEASEDIR/data-source"
+#svn export --force "$CURRENTDIR/../../../git-data-source" "$RELEASEDIR/data-source/"
+git archive --remote ${REPODIR}/megaglest-data-source/ HEAD: | tar x
+
+cd "$CURRENTDIR"
 echo "creating $PACKAGE"
 [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
 #tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/" "$RELEASENAME-$VERSION"
diff --git a/mk/linux/makedata.sh b/mk/linux/makedata.sh
index 4727d3ab..bcb4707a 100755
--- a/mk/linux/makedata.sh
+++ b/mk/linux/makedata.sh
@@ -14,6 +14,7 @@ PACKAGE="$RELEASENAME-$VERSION.tar.xz"
 CURRENTDIR="$(dirname $(readlink -f $0))"
 RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
 SOURCEDIR="$CURRENTDIR/../../source/"
+REPODIR="$CURRENTDIR/../../"
 
 echo "Creating data package in $RELEASEDIR"
 
@@ -21,43 +22,105 @@ echo "Creating data package in $RELEASEDIR"
 mkdir -p "$RELEASEDIR"
 
 # copy data
-svn export --force "$CURRENTDIR/../../mk/linux/megaglest.bmp" "$RELEASEDIR/megaglest.bmp"
-svn export --force "$CURRENTDIR/../../mk/linux/megaglest.desktop" "$RELEASEDIR/megaglest.desktop"
-svn export --force "$CURRENTDIR/../../mk/linux/megaglest.png" "$RELEASEDIR/megaglest.png"
-svn export --force "$CURRENTDIR/../../mk/linux/megaglest.xpm" "$RELEASEDIR/megaglest.xpm"
-svn export --force "$CURRENTDIR/../../mk/linux/glest.ico" "$RELEASEDIR/glest.ico"
-svn export --force "$CURRENTDIR/../../mk/linux/configuration.xml" "$RELEASEDIR/configuration.xml"
-svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" "$RELEASEDIR/megaglest.ico"
-svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" "$RELEASEDIR/g3dviewer.ico"
-svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" "$RELEASEDIR/editor.ico"
-svn export --force "$CURRENTDIR/../../data/glest_game/servers.ini" "$RELEASEDIR/servers.ini"
-svn export --force "$CURRENTDIR/../../data/glest_game/glest.ini" "$RELEASEDIR/glest_windows.ini"
-svn export --force "$CURRENTDIR/../../mk/linux/glest.ini" "$RELEASEDIR/glest_linux.ini"
-svn export --force "$CURRENTDIR/../../data/glest_game/glestkeys.ini" "$RELEASEDIR/glestkeys.ini"
+echo "Exporting image and ini files ..."
+cd "$RELEASEDIR"
+# svn export --force "$CURRENTDIR/../../mk/linux/megaglest.bmp" "$RELEASEDIR/megaglest.bmp"
+# svn export --force "$CURRENTDIR/../../mk/linux/megaglest.desktop" "$RELEASEDIR/megaglest.desktop"
+# svn export --force "$CURRENTDIR/../../mk/linux/megaglest.png" "$RELEASEDIR/megaglest.png"
+# svn export --force "$CURRENTDIR/../../mk/linux/megaglest.xpm" "$RELEASEDIR/megaglest.xpm"
+# svn export --force "$CURRENTDIR/../../mk/linux/glest.ico" "$RELEASEDIR/glest.ico"
+# svn export --force "$CURRENTDIR/../../mk/linux/configuration.xml" "$RELEASEDIR/configuration.xml"
 
+# svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" "$RELEASEDIR/megaglest.ico"
+# svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" "$RELEASEDIR/g3dviewer.ico"
+# svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" "$RELEASEDIR/editor.ico"
+# svn export --force "$CURRENTDIR/../../data/glest_game/servers.ini" "$RELEASEDIR/servers.ini"
+# svn export --force "$CURRENTDIR/../../data/glest_game/glest.ini" "$RELEASEDIR/glest_windows.ini"
+# svn export --force "$CURRENTDIR/../../mk/linux/glest.ini" "$RELEASEDIR/glest_linux.ini"
+# svn export --force "$CURRENTDIR/../../data/glest_game/glestkeys.ini" "$RELEASEDIR/glestkeys.ini"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD: CMakeLists.txt | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.bmp | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.desktop | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.png | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.xpm | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ glest.ico | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ glest.ini | tar x
+mv glest.ini glest_linux.ini
+git archive --remote ${REPODIR}/data/glest_game/ HEAD: megaglest.ico | tar x
+git archive --remote ${REPODIR}/data/glest_game/ HEAD: g3dviewer.ico | tar x
+git archive --remote ${REPODIR}/data/glest_game/ HEAD: editor.ico | tar x
+git archive --remote ${REPODIR}/data/glest_game/ HEAD: servers.ini | tar x
+git archive --remote ${REPODIR}/data/glest_game/ HEAD: glest.ini | tar x
+git archive --remote ${REPODIR}/data/glest_game/ HEAD: glestkeys.ini | tar x
+mv glest.ini glest_windows.ini
+
+echo "Exporting game data files ..."
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/data/"
-svn export --force "$CURRENTDIR/../../data/glest_game/data" "$RELEASEDIR/data/"
+cd "$RELEASEDIR/data/"
+# svn export --force "$CURRENTDIR/../../data/glest_game/data" "$RELEASEDIR/data/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:data | tar x
+
+echo "Exporting doc files ..."
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/docs/"
-svn export --force "$CURRENTDIR/../../data/glest_game/docs" "$RELEASEDIR/docs/"
-svn export --force "$CURRENTDIR/../../docs/CHANGELOG.txt" "$RELEASEDIR/docs/CHANGELOG.txt"
-svn export --force "$CURRENTDIR/../../docs/README.txt" "$RELEASEDIR/docs/README.txt"
+cd "$RELEASEDIR/docs/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/docs" "$RELEASEDIR/docs/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:docs | tar x
+
+cd "$RELEASEDIR/docs/"
+#svn export --force "$CURRENTDIR/../../docs/CHANGELOG.txt" "$RELEASEDIR/docs/CHANGELOG.txt"
+git archive --remote ${REPODIR} HEAD:docs/ CHANGELOG.txt | tar x
+
+cd "$RELEASEDIR/docs/"
+#svn export --force "$CURRENTDIR/../../docs/README.txt" "$RELEASEDIR/docs/README.txt"
+git archive --remote ${REPODIR} HEAD:docs/ README.txt | tar x
+
+echo "Exporting map files ..."
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/maps/"
-svn export --force "$CURRENTDIR/../../data/glest_game/maps" "$RELEASEDIR/maps/"
+cd "$RELEASEDIR/maps/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/maps" "$RELEASEDIR/maps/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:maps | tar x
+
+echo "Exporting scenario files ..."
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/scenarios/"
-svn export --force "$CURRENTDIR/../../data/glest_game/scenarios" "$RELEASEDIR/scenarios/"
+cd "$RELEASEDIR/scenarios/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/scenarios" "$RELEASEDIR/scenarios/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:scenarios | tar x
+
+echo "Exporting tech files ..."
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/techs/"
-svn export --force "$CURRENTDIR/../../data/glest_game/techs" "$RELEASEDIR/techs/"
+cd "$RELEASEDIR/techs/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/techs" "$RELEASEDIR/techs/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:techs | tar x
+
+echo "Exporting tileset files ..."
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/tilesets/"
-svn export --force "$CURRENTDIR/../../data/glest_game/tilesets" "$RELEASEDIR/tilesets/"
+cd "$RELEASEDIR/tilesets/"
+#svn export --force "$CURRENTDIR/../../data/glest_game/tilesets" "$RELEASEDIR/tilesets/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:tilesets | tar x
+
+echo "Exporting tutorial files ..."
+cd "$RELEASEDIR"
 mkdir -p "$RELEASEDIR/tutorials/"
-svn export --force "$CURRENTDIR/../../data/glest_game/tutorials" "$RELEASEDIR/tutorials/"
+cd "$RELEASEDIR/tutorials/"
+# svn export --force "$CURRENTDIR/../../data/glest_game/tutorials" "$RELEASEDIR/tutorials/"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:tutorials | tar x
 
 # 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/"
 
-svn export --force "$CURRENTDIR/../../data/glest_game/CMakeLists.txt" "$RELEASEDIR/CMakeLists.txt"
+# cd "$RELEASEDIR"
+#svn export --force "$CURRENTDIR/../../data/glest_game/CMakeLists.txt" "$RELEASEDIR/CMakeLists.txt"
+# git archive --remote ${REPODIR}/data/glest_game/ HEAD: CMakeLists.txt | tar x
 
+echo "Removing non required files ..."
+cd "$CURRENTDIR"
 # START
 # remove embedded data
 rm -rf "$RELEASEDIR/data/core/fonts"
diff --git a/mk/linux/makerelease-embedded.sh b/mk/linux/makerelease-embedded.sh
index 5ea3a7ad..b027cc7b 100755
--- a/mk/linux/makerelease-embedded.sh
+++ b/mk/linux/makerelease-embedded.sh
@@ -11,6 +11,7 @@ PACKAGE="$RELEASENAME-$VERSION.tar.xz"
 CURRENTDIR="$(dirname $(readlink -f $0))"
 RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
 SOURCEDIR="$CURRENTDIR/../../source/"
+REPODIR="$CURRENTDIR/../../"
 
 echo "Creating source package in $RELEASEDIR"
 
@@ -19,13 +20,21 @@ mkdir -p "$RELEASEDIR"
 
 mkdir -p "$RELEASEDIR/source/shared_lib/sources/libircclient/"
 mkdir -p "$RELEASEDIR/source/shared_lib/include/libircclient/"
-svn export --force "$SOURCEDIR/shared_lib/sources/libircclient" "$RELEASEDIR/source/shared_lib/sources/libircclient"
-svn export --force "$SOURCEDIR/shared_lib/include/libircclient" "$RELEASEDIR/source/shared_lib/include/libircclient"
+cd "$RELEASEDIR/source/shared_lib/sources/libircclient/"
+#svn export --force "$SOURCEDIR/shared_lib/sources/libircclient" "$RELEASEDIR/source/shared_lib/sources/libircclient"
+git archive --remote ${REPODIR} HEAD:source/shared_lib/sources/libircclient | tar x
+cd "$RELEASEDIR/source/shared_lib/include/libircclient/"
+#svn export --force "$SOURCEDIR/shared_lib/include/libircclient" "$RELEASEDIR/source/shared_lib/include/libircclient"
+git archive --remote ${REPODIR} HEAD:source/shared_lib/include/libircclient | tar x
 
 mkdir -p "$RELEASEDIR/source/shared_lib/sources/platform/miniupnpc/"
 mkdir -p "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc/"
-svn export --force "$SOURCEDIR/shared_lib/sources/platform/miniupnpc" "$RELEASEDIR/source/shared_lib/sources/platform/miniupnpc"
-svn export --force "$SOURCEDIR/shared_lib/include/platform/miniupnpc" "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc"
+cd "$RELEASEDIR/source/shared_lib/sources/platform/miniupnpc/"
+#svn export --force "$SOURCEDIR/shared_lib/sources/platform/miniupnpc" "$RELEASEDIR/source/shared_lib/sources/platform/miniupnpc"
+git archive --remote ${REPODIR} HEAD:source/shared_lib/sources/platform/miniupnpc | tar x
+cd "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc/"
+#svn export --force "$SOURCEDIR/shared_lib/include/platform/miniupnpc" "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc"
+git archive --remote ${REPODIR} HEAD:source/shared_lib/include/platform/miniupnpc | tar x
 
 #mkdir -p "$RELEASEDIR/source/shared_lib/sources/streflop/"
 #mkdir -p "$RELEASEDIR/source/shared_lib/include/streflop/"
@@ -33,11 +42,16 @@ svn export --force "$SOURCEDIR/shared_lib/include/platform/miniupnpc" "$RELEASED
 #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"
+cd "$RELEASEDIR/source/masterserver/flags/"
+#svn export --force "$SOURCEDIR/masterserver/flags" "$RELEASEDIR/source/masterserver/flags"
+git archive --remote ${REPODIR} HEAD:source/masterserver/flags | tar x
 
 mkdir -p "$RELEASEDIR/data/core/fonts/"
-svn export --force "$SOURCEDIR/../data/glest_game/data/core/fonts" "$RELEASEDIR/data/core/fonts"
+cd "$RELEASEDIR/data/core/fonts/"
+#svn export --force "$SOURCEDIR/../data/glest_game/data/core/fonts" "$RELEASEDIR/data/core/fonts"
+git archive --remote ${REPODIR}/data/glest_game/ HEAD:data/core/fonts | tar x
 
+cd "$CURRENTDIR"
 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 f617c227..9a0e7b7b 100755
--- a/mk/linux/makerelease.sh
+++ b/mk/linux/makerelease.sh
@@ -10,49 +10,90 @@ PACKAGE="$RELEASENAME-$VERSION.tar.xz"
 CURRENTDIR="$(dirname $(readlink -f $0))"
 RELEASEDIR="$CURRENTDIR/release/$RELEASENAME-$VERSION/megaglest-$VERSION"
 SOURCEDIR="$CURRENTDIR/../../source/"
+REPODIR="$CURRENTDIR/../../"
 
-echo "Creating source package in $RELEASEDIR"
+echo "Creating source package in: ${RELEASEDIR} git REPO is in: ${REPODIR}"
+# exit 1
 
 [[ -d "$RELEASEDIR" ]] && rm -rf "$RELEASEDIR"
 mkdir -p "$RELEASEDIR"
 
-svn export --force "$SOURCEDIR" "$RELEASEDIR/source"
+echo "Exporting source ..."
+# svn export --force "$SOURCEDIR" "$RELEASEDIR/source"
+cd "$RELEASEDIR"
+mkdir source
+cd source
+git archive --remote ${REPODIR} HEAD:source | tar x
+cd "$RELEASEDIR"
 
-mkdir -p "$RELEASEDIR/mk/cmake/"
-svn export --force "$CURRENTDIR/../cmake/" "$RELEASEDIR/mk/cmake/"
-mkdir -p "$RELEASEDIR/mk/macosx/"
-svn export --force "$CURRENTDIR/../macosx/" "$RELEASEDIR/mk/macosx/"
-mkdir -p "$RELEASEDIR/mk/windoze/"
-svn export --force "$CURRENTDIR/../windoze/" "$RELEASEDIR/mk/windoze/"
+echo "Exporting mk ..."
+# mkdir -p "$RELEASEDIR/mk/cmake/"
+# svn export --force "$CURRENTDIR/../cmake/" "$RELEASEDIR/mk/cmake/"
+# mkdir -p "$RELEASEDIR/mk/macosx/"
+# svn export --force "$CURRENTDIR/../macosx/" "$RELEASEDIR/mk/macosx/"
+# mkdir -p "$RELEASEDIR/mk/windoze/"
+# svn export --force "$CURRENTDIR/../windoze/" "$RELEASEDIR/mk/windoze/"
+mkdir -p mk
+cd mk
+git archive --remote ${REPODIR} HEAD:mk | tar x
+cd "$RELEASEDIR"
 
-svn export --force "$CURRENTDIR/../../docs" $RELEASEDIR
+echo "Exporting docs ..."
+# svn export --force "$CURRENTDIR/../../docs" $RELEASEDIR
+mkdir docs
+cd docs
+git archive --remote ${REPODIR} HEAD:docs | tar x
+cd "$RELEASEDIR"
 
-svn export --force "$CURRENTDIR/glest.ini" $RELEASEDIR/glest.ini
-svn export --force "$CURRENTDIR/glestkeys.ini" $RELEASEDIR/glestkeys.ini
-svn export --force "$CURRENTDIR/servers.ini" $RELEASEDIR/servers.ini
-svn export --force "$CURRENTDIR/glest.ico" $RELEASEDIR/glest.ico
-svn export --force "$CURRENTDIR/megaglest.bmp" $RELEASEDIR/megaglest.bmp
-svn export --force "$CURRENTDIR/megaglest.png" $RELEASEDIR/megaglest.png
-svn export --force "$CURRENTDIR/megaglest.xpm" $RELEASEDIR/megaglest.xpm
-svn export --force "$CURRENTDIR/megaglest.desktop" $RELEASEDIR/megaglest.desktop
-svn export --force "$CURRENTDIR/megaglest_editor.desktop" $RELEASEDIR/megaglest_editor.desktop
-svn export --force "$CURRENTDIR/megaglest_g3dviewer.desktop" $RELEASEDIR/megaglest_g3dviewer.desktop
+echo "Exporting files in mk/linux ..."
+# svn export --force "$CURRENTDIR/glest.ini" $RELEASEDIR/glest.ini
+# svn export --force "$CURRENTDIR/glestkeys.ini" $RELEASEDIR/glestkeys.ini
+# svn export --force "$CURRENTDIR/servers.ini" $RELEASEDIR/servers.ini
+# svn export --force "$CURRENTDIR/glest.ico" $RELEASEDIR/glest.ico
+# svn export --force "$CURRENTDIR/megaglest.bmp" $RELEASEDIR/megaglest.bmp
+# svn export --force "$CURRENTDIR/megaglest.png" $RELEASEDIR/megaglest.png
+# svn export --force "$CURRENTDIR/megaglest.xpm" $RELEASEDIR/megaglest.xpm
+# svn export --force "$CURRENTDIR/megaglest.desktop" $RELEASEDIR/megaglest.desktop
+# svn export --force "$CURRENTDIR/megaglest_editor.desktop" $RELEASEDIR/megaglest_editor.desktop
+# svn export --force "$CURRENTDIR/megaglest_g3dviewer.desktop" $RELEASEDIR/megaglest_g3dviewer.desktop
+git archive --remote ${REPODIR} HEAD:mk/linux/ glest.ini | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ glestkeys.ini | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ servers.ini | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ glest.ico | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.bmp | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.png | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.xpm | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.desktop | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest_editor.desktop | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest_g3dviewer.desktop | tar x
 
 # The mnpages are auto generated by the build process so no need to ship with source
 # svn export --force "$CURRENTDIR/megaglest.6" $RELEASEDIR/megaglest.6
 # svn export --force "$CURRENTDIR/megaglest_editor.6" $RELEASEDIR/megaglest_editor.6
 # svn export --force "$CURRENTDIR/megaglest_g3dviewer.6" $RELEASEDIR/megaglest_g3dviewer.6
 
-svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" $RELEASEDIR/megaglest.ico
-svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR/g3dviewer.ico
-svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR/editor.ico
-svn export --force "$CURRENTDIR/start_megaglest" $RELEASEDIR/start_megaglest
-svn export --force "$CURRENTDIR/start_megaglest_g3dviewer" $RELEASEDIR/start_megaglest_g3dviewer
-svn export --force "$CURRENTDIR/start_megaglest_mapeditor" $RELEASEDIR/start_megaglest_mapeditor
-svn export --force "$CURRENTDIR/setupBuildDeps.sh" $RELEASEDIR/setupBuildDeps.sh
-svn export --force "$CURRENTDIR/../../CMakeLists.txt" $RELEASEDIR/CMakeLists.txt
+echo "Exporting files in data/glest_game ..."
+# svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" $RELEASEDIR/megaglest.ico
+# svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR/g3dviewer.ico
+# svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR/editor.ico
+# svn export --force "$CURRENTDIR/start_megaglest" $RELEASEDIR/start_megaglest
+# svn export --force "$CURRENTDIR/start_megaglest_g3dviewer" $RELEASEDIR/start_megaglest_g3dviewer
+# svn export --force "$CURRENTDIR/start_megaglest_mapeditor" $RELEASEDIR/start_megaglest_mapeditor
+# svn export --force "$CURRENTDIR/setupBuildDeps.sh" $RELEASEDIR/setupBuildDeps.sh
+# svn export --force "$CURRENTDIR/../../CMakeLists.txt" $RELEASEDIR/CMakeLists.txt
+git archive --remote ${REPODIR}/data/glest_game/ HEAD: megaglest.ico | tar x
+git archive --remote ${REPODIR}/data/glest_game/ HEAD: g3dviewer.ico | tar x
+git archive --remote ${REPODIR}/data/glest_game/ HEAD: editor.ico | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ start_megaglest | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ start_megaglest_g3dviewer | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ start_megaglest_mapeditor | tar x
+git archive --remote ${REPODIR} HEAD:mk/linux/ setupBuildDeps.sh | tar x
+git archive --remote ${REPODIR} HEAD: CMakeLists.txt | tar x
+
+# exit 1
 
 # START
+echo "Removing non required files ..."
 # 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/"
@@ -63,6 +104,7 @@ rm -rf "$RELEASEDIR/source/shared_lib/include/platform/miniupnpc/"
 rm -rf "$RELEASEDIR/source/masterserver/flags/"
 # END
 
+cd ${CURRENTDIR}
 echo "Creating $PACKAGE"
 [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"
 tar cJf "release/$PACKAGE" -C "$CURRENTDIR/release/$RELEASENAME-$VERSION" "megaglest-$VERSION"