X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/cd4acff547d8ae0be943a0ac7c34ff55ba0ba51a..fa033cc8c526e2eb9980af134f5a272ce28dbbf1:/tools/make/mconfigure diff --git a/tools/make/mconfigure b/tools/make/mconfigure index 5eca6fe..6b33ad9 100755 --- a/tools/make/mconfigure +++ b/tools/make/mconfigure @@ -11,7 +11,7 @@ function echo_usage { function check_unversioned { # has to be called in the projects base directory - # result: "U" in stdout or nothing + # result: "M" in stdout or nothing project=$(pwd) project=${project##*/} @@ -21,7 +21,7 @@ function check_unversioned { rm $project.batch if [ "${wc:0:5}" != "0 0 0" ] then - echo "MU" + echo "M" fi popd >/dev/null } @@ -40,18 +40,18 @@ function set_build { 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" + tag="0.0-0TOP" fi changes=$(check_unversioned) tag="$tag$changes" - version=${tag%%-*} + version=${tag%-*} version=${version##*_} - build=${tag#*-} + build=${tag##*-} else echo "No configuration system found. Cannot determine version." exit 1 @@ -200,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 # ./. ---------------------------------------------