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

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index a6e919d..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
@@ -120,15 +137,21 @@ then
 	# delete changelog and control
 	rm debian/changelog debian/control || true
 	
-	echo "paket=$paket" > debian/rules.pre
+	# mconfigure builds 2 environment files: setenv.sh + rules.pre
+	# setenv.sh is finally appended to rules.pre
+	
+	dpkg-architecture > debian/setenv.sh
+	echo "" > debian/rules.pre
+	
+	echo "paket=$paket" >> debian/setenv.sh
 #	shift
 	ARCH=""
 	cpp_build=0
 
 	set_build
 	check_version
-	echo "version=$version" >> debian/rules.pre
-	echo "build=$build" >> debian/rules.pre
+	echo "version=$version" >> debian/setenv.sh
+	echo "build=$build" >> debian/setenv.sh
 
 	# get repository name
 #	tmp=$(pwd)
@@ -153,18 +176,20 @@ then
 	then
 		echo "add_inst_tgt += debian/tmp/DEBIAN/preinst" >> rules.pre
 	fi
-        if [ -f $paket.postinst ]
-        then
-                echo "add_inst_tgt += debian/tmp/DEBIAN/postinst" >> rules.pre
-        fi
-        if [ -f $paket.prerm ]
-        then
-                echo "add_inst_tgt += debian/tmp/DEBIAN/prerm" >> rules.pre
-        fi
-        if [ -f $paket.postrm ]
-        then
-                echo "add_inst_tgt += debian/tmp/DEBIAN/postrm" >> rules.pre
-        fi
+	if [ -f $paket.postinst ]
+	then
+		    echo "add_inst_tgt += debian/tmp/DEBIAN/postinst" >> rules.pre
+	fi
+	if [ -f $paket.prerm ]
+	then
+		    echo "add_inst_tgt += debian/tmp/DEBIAN/prerm" >> rules.pre
+	fi
+	if [ -f $paket.postrm ]
+	then
+		    echo "add_inst_tgt += debian/tmp/DEBIAN/postrm" >> rules.pre
+	fi
+	
+	cat setenv.sh >> rules.pre
 
 	mkdir -p tmp/DEBIAN
 
@@ -175,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
 	# ./. ---------------------------------------------
@@ -226,7 +254,6 @@ then
 	else
 		echo "PACK=version" >> debian/rules.pre
 	fi
-	cp debian/rules.pre debian/setenv.sh
 fi
 
 if [ $compile -eq 1 -a ! -e debian/$paket.build ]