X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=tools%2Fmake%2Fmconfigure;h=ecb35a381b82a6bb049aa3ab9b59a8ff330b9e47;hb=f98036f07e88d9bf219ef068a78250c7ed6c7938;hp=d49601ef18eec11b3a9c9953eae4d9599b3ba15b;hpb=5430e52c52a1918b8b337c5ad2b9982a83097a7d;p=projects.git

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index d49601e..ecb35a3 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -4,21 +4,45 @@ 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)
 	elif [ -e .git ]
 	then
-		build=$(git describe --tags 2>/dev/null)
-		test -n "$build" || build="TOP"
+		tag=$(git describe --tags 2>/dev/null) || true
+		if test -z "$tag"
+		then
+			tag="0.0-TOP"
+		fi
 		changes=$(git status -s |grep "^ *M") || true
-		test -z "$changes" || build="${build}M"
+		if test -n "$changes"
+		then
+			tag="${tag}M"
+		fi
+		version=${tag%-*}
+		build=${tag#*-}
 	fi
 }
 
+function check_version {
+	if [ $version = "0.0" ]
+	then
+		return
+	fi
+	vline=$(head -1 debian/$paket.changelog)
+	vline=${vline%-*}
+	clversion=${vline#*(}
+	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
@@ -29,31 +53,46 @@ then
 	exit 1
 fi
 
-#TODO: check, if running in debian-dir
+if [ ! -d debian ]
+then
+	echo "run mconfigure in the project base directory!"
+	exit 2
+fi
 
-paket=$1
+echo "export paket=$1" > debian/setenv.sh
 shift
 ARCH=""
 cpp_build=0
-delete_src=1
 
 set_build
-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
+check_version
+echo "export version=$version" >> debian/setenv.sh
+echo "export build=$build" >> debian/setenv.sh
+
+# get repository name
+tmp=$(pwd)
+pwd=${tmp##*/}
+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 ]
@@ -61,17 +100,19 @@ echo "building $paket with build $build"
 #	rm -rf build
 #fi
 #
-#mkdir -p build
-#pushd build >/dev/null
-#
-#ln -sf /usr/share/mbuild/makefile .
 
-if [ -e $paket ]
-then
-	rm -rf $paket
-fi
-rm *.stamp || true
-rm make.pre || true
+pushd debian >/dev/null
+
+ln -sf /usr/share/mbuild/rules .
+
+#if [ -e tmp ]
+#then
+#	rm -rf tmp
+#fi
+#rm *.stamp 2>/dev/null || true
+#rm make.pre 2>/dev/null || true
+
+mkdir -p tmp/DEBIAN
 
 # load util functions for C/C++ - build
 if [ -f $paket.cpp.sh ]
@@ -82,39 +123,54 @@ then
 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
+#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
 
-# check for copy file
-copy=$(find .. -name $paket.cp)
-if [ -n "$copy" ]
+popd >/dev/null
+
+if [ $prepare = 1 ]
 then
-	ln -sf $copy .
-else
-	echo "warning: file $paket.cp missing or not executable:"
-	echo "  this file is necessary for any package production."
+	exit 0
 fi
 
-# check for installation scripts
-files=$(find .. -name $paket.preinst)
-files="$files $(find .. -name $paket.postinst)"
-files="$files $(find .. -name $paket.prerm)"
-files="$files $(find .. -name $paket.postrm)"
-for file in $files
-do
-	ln -sf $file .
-done
+# build package
+. debian/setenv.sh
+debian/rules binary
+
+## check for copy file
+#if [ ! -f $paket.cp ]
+#then
+#	# search for copy file
+#	copy=$(find .. -name $paket.cp)
+#	if [ -n "$copy" ]
+#	then
+#		ln -sf $copy .
+#	else
+#		echo "warning: file $paket.cp missing or not executable:"
+#		echo "  this file is necessary for any package production."
+#	fi
+#fi
+#
+## check for installation scripts
+#files=$(find .. -name $paket.preinst)
+#files="$files $(find .. -name $paket.postinst)"
+#files="$files $(find .. -name $paket.prerm)"
+#files="$files $(find .. -name $paket.postrm)"
+#for file in $files
+#do
+#	ln -sf $file .
+#done
 
 # create generic make.pre, if not existing
 #if [ ! -f make.pre ]