From: Michael Wagner <michael@wagnertech.de>
Date: Fri, 22 Mar 2019 23:06:33 +0000 (+0100)
Subject: posaune
X-Git-Tag: mbuild_0.3-2~1
X-Git-Url: http://wagnertech.de/git?p=projects.git;a=commitdiff_plain;h=cd4acff547d8ae0be943a0ac7c34ff55ba0ba51a

posaune
---

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 4313e46..5eca6fe 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -9,12 +9,32 @@ function echo_usage {
 	echo "	-p : pack default: do all"
 }
 
+function check_unversioned {
+	# has to be called in the projects base directory
+	# result: "U" in stdout or nothing
+	
+	project=$(pwd)
+	project=${project##*/}
+	pushd .. >/dev/null
+		mCM $project -b -an > /dev/null
+		wc=$(wc $project.batch)
+		rm $project.batch
+		if [ "${wc:0:5}" != "0 0 0" ]
+		then
+			echo "MU"
+		fi
+	popd >/dev/null
+}
+
 function set_build {
 	if [ -e .svn ]
 	then
 		version="0.0"
 		build=$(svnversion)
 		build=${build/:/-}
+		pushd .. >/dev/null
+			build="$build$(check_unversioned)"
+		popd >/dev/null
 	elif [ -e .git ]
 	then
 		tag=$(git describe --tags 2>/dev/null) || true
@@ -27,11 +47,8 @@ function set_build {
 		then
 			tag="0.0-TOP"
 		fi
-		changes=$(git status -s |grep "^ *M") || true
-		if test -n "$changes"
-		then
-			tag="${tag}M"
-		fi
+		changes=$(check_unversioned)
+		tag="$tag$changes"
 		version=${tag%%-*}
 		version=${version##*_}
 		build=${tag#*-}