X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/ff2607419be96666a6e4eff72a86a5341335d216..34d5bcbab5f361fa83c207abe3b177e1f408b6db:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index b2bff6f..2cb0096 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -9,27 +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
-		changes=$(git status -s |grep "^ *M") || true
-		if test -n "$changes"
+		tag_paket=${tag%_*}
+		if [ "$tag_paket" != "$paket" ]
 		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
@@ -37,6 +59,7 @@ function set_build {
 }
 
 function check_version {
+	
 	vline=$(head -1 debian/$paket.changelog)
 	vline=${vline%-*}
 	clversion=${vline#*(}
@@ -45,6 +68,13 @@ function check_version {
 		version=$clversion
 		return
 	fi
+
+	# do no check on a modified git repos
+	if [ "${build: -1}" == "M" ]
+	then
+		return
+	fi
+
 	if [ "$clversion" != $version ]
 	then
 		echo "version mismatch: git: $version, changelog: $clversion"
@@ -104,15 +134,24 @@ fi
 
 if [ $configure -eq 1 ]
 then
-	echo "paket=$paket" > debian/rules.pre
+	# delete changelog and control
+	rm debian/changelog debian/control || true
+	
+	# 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)
@@ -137,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
 
@@ -166,7 +207,8 @@ then
 	# copy package control
 	if [ -f debian/$paket.control ]
 	then
-		cp debian/$paket.control debian/control
+		# proceed
+		echo
 	else
 		# try old fashoned way
 		control=$(find etc -name $paket.control) || true
@@ -175,12 +217,12 @@ then
 			echo "warning: control file not found"
 			echo "  this file is necessary for any package production."
 		else	
-			echo "Source: $pwd
+			echo "Source: $paket
 	Section: main
 	Priority: optional
 	Maintainer: WagnerTech UG <mail@wagnertech.de>
-	" > debian/control
-			grep -v "Version:" $control |grep -v "Maintainer:" >> debian/control 
+	" > debian/$paket.control
+			grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control 
 		fi
 	fi
 	
@@ -219,12 +261,14 @@ fi
 if [ $compile -eq 1 ]
 then
 	# build artefacts
+	. debian/setenv.sh
 	debian/rules build
 fi
 
 if [ $pack -eq 1 ]
 then
 	# build package
+	. debian/setenv.sh
 	debian/rules pack
 fi