X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/0633b557b49fed857fcb209037a12138c7cb6467..fa033cc8c526e2eb9980af134f5a272ce28dbbf1:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 4313e46..6b33ad9 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -9,32 +9,49 @@ function echo_usage {
 	echo "	-p : pack default: do all"
 }
 
+function check_unversioned {
+	# has to be called in the projects base directory
+	# result: "M" 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 "M"
+		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
 		if test -z "$tag"
 		then
-			tag="0.0-TOP"
+			tag="0.0-0TOP"
 		fi
 		tag_paket=${tag%_*}
 		if [ "$tag_paket" != "$paket" ]
 		then
-			tag="0.0-TOP"
-		fi
-		changes=$(git status -s |grep "^ *M") || true
-		if test -n "$changes"
-		then
-			tag="${tag}M"
+			tag="0.0-0TOP"
 		fi
-		version=${tag%%-*}
+		changes=$(check_unversioned)
+		tag="$tag$changes"
+		version=${tag%-*}
 		version=${version##*_}
-		build=${tag#*-}
+		build=${tag##*-}
 	else
 		echo "No configuration system found. Cannot determine version."
 		exit 1
@@ -183,6 +200,9 @@ then
 		. projects/tools/make/c_configure.sh
 		. $paket.cpp.sh
 	fi
+	
+	# add export to setenv.sh
+	sed -i "s/^/export /" setenv.sh
 
 	popd >/dev/null
 	# ./. ---------------------------------------------