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

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 6b33ad9..f37f6a3 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,11 +2,12 @@
 set -e
 
 function echo_usage {
-	echo "usage: mconfigure <package> [options]"
+	echo "usage: mconfigure [options] <package>"
 	echo "	-a <arch>"
 	echo "	-c : configure"
 	echo "	-d : compile"
 	echo "	-p : pack default: do all"
+	echo "	-o : support old Debian 7 format"
 }
 
 function check_unversioned {
@@ -32,21 +33,14 @@ function set_build {
 		version="0.0"
 		build=$(svnversion)
 		build=${build/:/-}
-		pushd .. >/dev/null
-			build="$build$(check_unversioned)"
-		popd >/dev/null
+		build="$build$(check_unversioned)"
 	elif [ -e .git ]
 	then
-		tag=$(git describe --tags 2>/dev/null) || true
+		tag=$(git describe --tags --match "${paket}_*" 2>/dev/null) || true
 		if test -z "$tag"
 		then
 			tag="0.0-0TOP"
 		fi
-		tag_paket=${tag%_*}
-		if [ "$tag_paket" != "$paket" ]
-		then
-			tag="0.0-0TOP"
-		fi
 		changes=$(check_unversioned)
 		tag="$tag$changes"
 		version=${tag%-*}
@@ -85,25 +79,16 @@ function check_version {
 # <package>.cp (optional): copy step for package production
 # <package>.cpp.sh (optional): commands to setup the C++ compile environment
 
-if [ $# -lt 1 ]
-then
-	echo_usage
-	exit 1
-fi
-
 if [ ! -d debian ]
 then
 	echo "run mconfigure in the project base directory with a debian directory in it!"
 	exit 2
 fi
 
-paket=$1
-
 configure=0
 compile=0
 pack=0
-shift
-while getopts ":acdp" opt; do
+while getopts "a:cdpo" opt; do
 	case $opt in
 		a) ARCH=$OPTARG
 			;;
@@ -113,6 +98,8 @@ while getopts ":acdp" opt; do
 			;;
 		p)	pack=1
 			;;
+		o)	oldpack="-Zgzip"
+			;;
 		\?) echo "Invalid option: -$OPTARG"
 			echo_usage
 			exit 1
@@ -123,6 +110,15 @@ while getopts ":acdp" opt; do
 			;;
 	esac
 done
+shift $((OPTIND -1))
+
+if [ $# -lt 1 ]
+then
+	echo_usage
+	exit 1
+fi
+
+paket=$1
 
 # if nothing is selected, select all
 if [ $configure -eq 0 -a $compile -eq 0 -a $pack -eq 0 ]
@@ -135,17 +131,19 @@ fi
 if [ $configure -eq 1 ]
 then
 	# delete changelog and control
-	rm debian/changelog debian/control || true
+	rm debian/changelog debian/control 2>/dev/null || true
 	
 	# mconfigure builds 2 environment files: setenv.sh + rules.pre
-	# setenv.sh is finally appended to rules.pre
 	
-	dpkg-architecture > debian/setenv.sh
+	if [ -n "$ARCH" ]
+	then
+		arch_opt="-a $ARCH"
+	fi
+	dpkg-architecture $arch_opt > debian/setenv.sh
 	echo "" > debian/rules.pre
 	
 	echo "paket=$paket" >> debian/setenv.sh
-#	shift
-	ARCH=""
+	echo "oldpack=\"$oldpack\"" >> debian/setenv.sh
 	cpp_build=0
 
 	set_build
@@ -189,7 +187,7 @@ then
 		    echo "add_inst_tgt += debian/tmp/DEBIAN/postrm" >> rules.pre
 	fi
 	
-	cat setenv.sh >> rules.pre
+	#cat setenv.sh >> rules.pre
 
 	mkdir -p tmp/DEBIAN
 
@@ -221,10 +219,10 @@ then
 			echo "  this file is necessary for any package production."
 		else	
 			echo "Source: $paket
-	Section: main
-	Priority: optional
-	Maintainer: WagnerTech UG <mail@wagnertech.de>
-	" > debian/$paket.control
+Section: main
+Priority: optional
+Maintainer: WagnerTech UG <mail@wagnertech.de>
+" > debian/$paket.control
 			grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control 
 		fi
 	fi
@@ -248,6 +246,14 @@ then
 	if [ -f debian/$paket.cp -a -f debian/$paket.control ]
 	then
 		echo "PACK=binary" >> debian/rules.pre
+		if grep "^Architecture: *all" debian/$paket.control >/dev/null
+		then
+			echo "arch = all" >> debian/rules.pre
+			echo "BINARY_INDEP = copy ../${paket}_$version-${build}_all.deb" >> debian/rules.pre
+		else
+			echo 'arch = ${DEB_HOST_ARCH}' >> debian/rules.pre
+			echo "BINARY_ARCH = copy ../${paket}_$version-${build}_"'$(arch).deb' >> debian/rules.pre
+		fi
 	elif [ -f debian/$paket.cp ]
 	then
 		echo "PACK=zip" >> debian/rules.pre