posaune

[projects.git] / tools / make / mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 4313e4606b86a2f4cbb871099b3a610db15f016e..5eca6fec0dc293f566b547037f8c02673b33ddfa 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -9,12 +9,32 @@ function echo_usage {
        echo "  -p : pack default: do all"
 }
 
        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/:/-}
 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
        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
                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#*-}
                version=${tag%%-*}
                version=${version##*_}
                build=${tag#*-}