From 1a698f022562ce43c91d84503860d9334ce0bfc9 Mon Sep 17 00:00:00 2001
From: filux <smartadminpl@gmail.com>
Date: Sun, 22 Nov 2015 20:00:56 +0100
Subject: [PATCH] tiny improvements related with CI & submodules

---
 data/glest_game                   |  2 +-
 mk/linux/make-data-archive.sh     | 13 +++++++++++--
 mk/windoze/build-mg-2010.bat      | 10 ++++++++--
 mk/windoze/build-mg-2012.bat      | 10 ++++++++--
 mk/windoze/build-mg-2015.bat      | 10 ++++++++--
 mk/windoze/build-mg32bit-2015.bat | 10 ++++++++--
 6 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/data/glest_game b/data/glest_game
index bf04854ad..ad32e03df 160000
--- a/data/glest_game
+++ b/data/glest_game
@@ -1 +1 @@
-Subproject commit bf04854ade7cd0fc51483c857e590acfef4fbc26
+Subproject commit ad32e03df80206332f3438b4008026faa3aac97e
diff --git a/mk/linux/make-data-archive.sh b/mk/linux/make-data-archive.sh
index eae9aaf2b..f3220ab59 100755
--- a/mk/linux/make-data-archive.sh
+++ b/mk/linux/make-data-archive.sh
@@ -24,7 +24,8 @@ if [ -f "$REPO_DATADIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then
     cd "$REPO_DATADIR"
     DATA_BRANCH="$(git branch | grep '^* ' | awk '{print $2}')"
     # on macos are problems with more advanced using awk ^
-    DATA_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h)]")"
+    DATA_COMMIT_NR="$(git rev-list HEAD --count)"
+    DATA_COMMIT="$(echo "[$DATA_COMMIT_NR.$(git log -1 --format=%h)]")"
     DATA_HASH=$(git log -1 --format=%H)
 fi
 if [ -d "$REPODIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then
@@ -53,7 +54,15 @@ DATA_HASH_MEMORY="$RELEASEDIR_ROOT/data_memory"
 DATA_HASH_FILE="$DATA_HASH_MEMORY/$VERSION-$SOURCE_BRANCH.log"
 if [ ! -d "$DATA_HASH_MEMORY" ]; then mkdir -p "$DATA_HASH_MEMORY"; fi
 if [ "$DATA_HASH" != "" ]; then
-    if [ ! -e "$DATA_HASH_FILE" ] || [ "$(cat "$DATA_HASH_FILE" | grep "$DATA_HASH")" = "" ]; then echo "$DATA_HASH" > "$DATA_HASH_FILE"; else exit 0; fi
+    if [ ! -e "$DATA_HASH_FILE" ]; then
+	echo "$DATA_HASH $DATA_COMMIT_NR" > "$DATA_HASH_FILE"
+    elif [ "$(cat "$DATA_HASH_FILE" | grep "$DATA_HASH")" = "" ]; then
+	DATA_COMMIT_PREV_NR="$(cat "$DATA_HASH_FILE" | head -1 | awk '{print $2}')"
+	if [ "$DATA_COMMIT_PREV_NR" != "" ] && [ "$DATA_COMMIT_NR" -lt "$DATA_COMMIT_PREV_NR" ]; then
+	    echo " warning: Detected older git revision of data than previously, $DATA_COMMIT_NR < $DATA_COMMIT_PREV_NR."
+	fi
+	echo "$DATA_HASH $DATA_COMMIT_NR" > "$DATA_HASH_FILE"
+    else exit 0; fi
 fi
 
 cd "$CURRENTDIR"
diff --git a/mk/windoze/build-mg-2010.bat b/mk/windoze/build-mg-2010.bat
index aabffa3a1..e96e8fe3f 100644
--- a/mk/windoze/build-mg-2010.bat
+++ b/mk/windoze/build-mg-2010.bat
@@ -72,9 +72,15 @@ rem Update from GIT to latest rev
 ECHO --------------------------------
 Echo Updating Code from GIT to latest Revision...
 cd ..\..\
+set GIT_NORM_BRANCH=.
+for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a
+if "%GIT_NORM_BRANCH%" == "." git pull
+cd data\glest_game
+set GIT_NORM_BRANCH=.
+for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a
+if "%GIT_NORM_BRANCH%" == "." git pull
+cd ..\..\
 git submodule update
-git pull
-git submodule foreach git pull
 
 set GITVERSION_SHA1=.
 set GITVERSION_REV=.
diff --git a/mk/windoze/build-mg-2012.bat b/mk/windoze/build-mg-2012.bat
index 838461a85..25464c227 100644
--- a/mk/windoze/build-mg-2012.bat
+++ b/mk/windoze/build-mg-2012.bat
@@ -96,9 +96,15 @@ rem Update from GIT to latest rev
 ECHO --------------------------------
 Echo Updating Code from GIT to latest Revision...
 cd ..\..\
+set GIT_NORM_BRANCH=.
+for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a
+if "%GIT_NORM_BRANCH%" == "." git pull
+cd data\glest_game
+set GIT_NORM_BRANCH=.
+for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a
+if "%GIT_NORM_BRANCH%" == "." git pull
+cd ..\..\
 git submodule update
-git pull
-git submodule foreach git pull
 
 set GITVERSION_SHA1=.
 set GITVERSION_REV=.
diff --git a/mk/windoze/build-mg-2015.bat b/mk/windoze/build-mg-2015.bat
index 5a1f0ab85..f58e6d3ae 100644
--- a/mk/windoze/build-mg-2015.bat
+++ b/mk/windoze/build-mg-2015.bat
@@ -84,9 +84,15 @@ rem Update from GIT to latest rev
 ECHO --------------------------------
 Echo Updating Code from GIT to latest Revision...
 cd ..\..\
+set GIT_NORM_BRANCH=.
+for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a
+if "%GIT_NORM_BRANCH%" == "." git pull
+cd data\glest_game
+set GIT_NORM_BRANCH=.
+for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a
+if "%GIT_NORM_BRANCH%" == "." git pull
+cd ..\..\
 git submodule update
-git pull
-git submodule foreach git pull
 
 set GITVERSION_SHA1=.
 set GITVERSION_REV=.
diff --git a/mk/windoze/build-mg32bit-2015.bat b/mk/windoze/build-mg32bit-2015.bat
index 398c72290..d7b7ceeba 100644
--- a/mk/windoze/build-mg32bit-2015.bat
+++ b/mk/windoze/build-mg32bit-2015.bat
@@ -78,9 +78,15 @@ rem Update from GIT to latest rev
 ECHO --------------------------------
 Echo Updating Code from GIT to latest Revision...
 cd ..\..\
+set GIT_NORM_BRANCH=.
+for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a
+if "%GIT_NORM_BRANCH%" == "." git pull
+cd data\glest_game
+set GIT_NORM_BRANCH=.
+for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\* (detached"') do @set GIT_NORM_BRANCH=%%a
+if "%GIT_NORM_BRANCH%" == "." git pull
+cd ..\..\
 git submodule update
-git pull
-git submodule foreach git pull
 
 set GITVERSION_SHA1=.
 set GITVERSION_REV=.