X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/1dd818ead588216487bfcd91c2a7767b1bdabbe8..92637bbe59b7bbd1550b7a577f349263773df4e2:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index d329219..8ce366e 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -4,27 +4,47 @@ set -e
 function echo_usage {
 	echo "usage: mconfigure <package> [options]"
 	echo "	-a <arch>"
+	echo "	-p : prepare build, but not do it"
 }
 
 function set_build {
 	if [ -e .svn ]
 	then
+		version="0.0"
 		build=$(svnversion)
+		build=${build/:/-}
 	elif [ -e .git ]
 	then
-		build=$(git describe --tags 2>/dev/null) || true
-		if test -z "$build"
+		tag=$(git describe --tags 2>/dev/null) || true
+		if test -z "$tag"
 		then
-			build="0.0-TOP"
+			tag="0.0-TOP"
 		fi
 		changes=$(git status -s |grep "^ *M") || true
-		if test -z "$changes"
+		if test -n "$changes"
 		then
-			build="${build}M"
+			tag="${tag}M"
 		fi
+		version=${tag%%-*}
+		build=${tag#*-}
 	fi
 }
 
+function check_version {
+	vline=$(head -1 debian/$paket.changelog)
+	vline=${vline%-*}
+	clversion=${vline#*(}
+	if [ $version = "0.0" ]
+	then
+		version=$clversion
+		return
+	fi
+	if [ "$clversion" != $version ]
+	then
+		echo "version mismatch: git: $version, changelog: $clversion"
+		exit 1
+	fi
+}
 # to build a package you need ...
 # <package>.cp (optional): copy step for package production
 # <package>.cpp.sh (optional): commands to setup the C++ compile environment
@@ -41,34 +61,42 @@ then
 	exit 2
 fi
 
-export paket=$1
+paket=$1
+echo "export paket=$1" > debian/setenv.sh
 shift
 ARCH=""
 cpp_build=0
 
 set_build
-export build
+check_version
+echo "export version=$version" >> debian/setenv.sh
+echo "export build=$build" >> debian/setenv.sh
 
 # get repository name
 tmp=$(pwd)
-export pwd=${tmp##*/}
-
-echo "building $paket with build $build"
-
-#while getopts ":a" opt; do
-#	case $opt in
-#		a) ARCH=$OPTARG
-#			;;
-#		\?) echo "Invalid option: -$OPTARG"
-#			echo_usage
-#			exit 1
-#			;;
-#		:) echo "Option -$OPTARG requires an argument."
-#			echo_usage
-#			exit 1
-#			;;
-#	esac
-#done
+pwd=${tmp##*/}
+pwd=${pwd,,*}
+echo "export pwd=$pwd" >> debian/setenv.sh
+
+echo "building $paket with build $version-$build"
+
+prepare=0
+while getopts ":ap" opt; do
+	case $opt in
+		a) ARCH=$OPTARG
+			;;
+		p) prepare=1
+			;;
+		\?) echo "Invalid option: -$OPTARG"
+			echo_usage
+			exit 1
+			;;
+		:) echo "Option -$OPTARG requires an argument."
+			echo_usage
+			exit 1
+			;;
+	esac
+done
 #
 ## clean dirs and check out
 #if [ -d build -a $delete_src -eq 1 ]
@@ -98,39 +126,50 @@ then
 	. $paket.cpp.sh
 fi
 
-# copy package control
-#control=$(find .. -name $paket.control)
-#build_number=${build#*_}
-#if [ -z "$control" ]
-#then
-#	echo "warning: control file not found"
-#	echo "  this file is necessary for any package production."
-#else	
-#	sed "s/%BUILD%/$build_number/" $control |sed "s/%ARCH%/$ARCH/" >$paket.control
-#	echo "$paket.control written."
-#
-#	# extract version
-#	version=$(grep Version $paket.control |sed "s/Version: //")
-#fi
-
 popd >/dev/null
 
-# build package
-debian/rules binary
+# copy package control
+if [ ! -f debian/control ]
+then
+	control=$(find etc -name $paket.control)
+	if [ -z "$control" ]
+	then
+		echo "warning: control file not found"
+		echo "  this file is necessary for any package production."
+	else	
+		echo "Source: $pwd
+Section: main
+Priority: optional
+Maintainer: WagnerTech UG <mail@wagnertech.de>
+" > debian/control
+		grep -v "Version:" $control |grep -v "Maintainer:" >> debian/control 
+	fi
+fi
+
+if [ $prepare = 1 ]
+then
+	exit 0
+fi
 
-## check for copy file
-#if [ ! -f $paket.cp ]
+# check for copy file
+#if [ ! -f debian/$paket.cp ]
 #then
 #	# search for copy file
-#	copy=$(find .. -name $paket.cp)
+#	copy=$(find . -name $paket.cp)
 #	if [ -n "$copy" ]
 #	then
-#		ln -sf $copy .
+#		echo "ln -sf ../$copy debian/"
+#		ln -sf ../$copy debian/
 #	else
 #		echo "warning: file $paket.cp missing or not executable:"
 #		echo "  this file is necessary for any package production."
 #	fi
 #fi
+
+# build package
+. debian/setenv.sh
+debian/rules binary
+
 #
 ## check for installation scripts
 #files=$(find .. -name $paket.preinst)