X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/160d72dfc4b7fbcd9f075fe71fd607e43c7b48c7..56b24328934af53e173afa7ffa576f03048db73e:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index c164f10..08f9d44 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,34 +2,91 @@
 set -e
 
 function echo_usage {
-	echo "usage: mconfigure <package> [options]"
+	echo "usage: mconfigure [options] <package>"
 	echo "	-a <arch>"
 	echo "	-c : configure"
+	echo "	-C <cross environment>"
 	echo "	-d : compile"
 	echo "	-p : pack default: do all"
+	echo "	-o : support old Debian 7 format"
+}
+
+function cmake_check {
+	pushd ../build >/dev/null
+		# do checks
+		if [ -e debian/$paket.build ]
+		then
+			echo "cmake is not compatible with other builds. Remove $paket.build"
+			exit 1
+		fi
+		if [ -e debian/$paket.prebuild ]
+		then
+			echo "cmake is not compatible with other builds. Remove $paket.prebuild"
+			exit 2
+		fi
+		
+		if [ -n "$cross" ]
+		then
+			# inject cross toolset
+			echo "set (CMAKE_MODULE_PATH $cross)" > CMakeLists.txt
+			echo "include(toolset)" >> CMakeLists.txt
+			cat debian/$paket.cmake >> CMakeLists.txt
+		else
+			cp debian/$paket.cmake CMakeLists.txt
+		fi
+
+		echo "make" > debian/$paket.build
+		chmod 755 debian/$paket.build
+		cmake .
+	popd >/dev/null
+}
+function check_unversioned {
+	# has to be called in the projects base directory
+	# result: "M" in stdout or nothing
+	set -e
+	
+	# check if build is running in a sandbox
+	if ! [ -f .cm.ignore ]
+	then
+		# we create one
+		echo ".cm.ignore" > .cm.ignore
+		echo "debian.*" >> .cm.ignore
+		echo "up.*" >> .cm.ignore
+	fi
+	
+	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 {
+	set -e
 	if [ -e .svn ]
 	then
 		version="0.0"
 		build=$(svnversion)
 		build=${build/:/-}
+		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-TOP"
-		fi
-		changes=$(git status -s |grep "^ *M") || true
-		if test -n "$changes"
-		then
-			tag="${tag}M"
+			tag="0.0-0TOP"
 		fi
-		version=${tag%%-*}
-		version=${version##*_}
-		build=${tag#*-}
+		changes=$(check_unversioned)
+		tag="$tag$changes"
+		version=${tag##*_}
+		version=${version%%-*}
+		build=${tag##*-}
 	else
 		echo "No configuration system found. Cannot determine version."
 		exit 1
@@ -37,6 +94,8 @@ function set_build {
 }
 
 function check_version {
+	set -e
+	
 	vline=$(head -1 debian/$paket.changelog)
 	vline=${vline%-*}
 	clversion=${vline#*(}
@@ -45,21 +104,19 @@ 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"
 		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
-
-if [ $# -lt 1 ]
-then
-	echo_usage
-	exit 1
-fi
 
 if [ ! -d debian ]
 then
@@ -67,13 +124,10 @@ then
 	exit 2
 fi
 
-paket=$1
-
 configure=0
 compile=0
 pack=0
-shift
-while getopts ":acdp" opt; do
+while getopts "a:cC:dpo" opt; do
 	case $opt in
 		a) ARCH=$OPTARG
 			;;
@@ -81,8 +135,12 @@ while getopts ":acdp" opt; do
 			;;
 		d)	compile=1
 			;;
+		C) cross=$OPTARG
+			;;
 		p)	pack=1
 			;;
+		o)	oldpack="-Zgzip"
+			;;
 		\?) echo "Invalid option: -$OPTARG"
 			echo_usage
 			exit 1
@@ -93,6 +151,21 @@ while getopts ":acdp" opt; do
 			;;
 	esac
 done
+shift $((OPTIND -1))
+
+if [ $# -lt 1 ]
+then
+	echo_usage
+	exit 1
+fi
+
+paket=$1
+
+if [ -n "$ARCH" -a -n "$cross" ]
+then
+	echo "invalid options: supply -a for multiarch or -C for explicit cross compile environment"
+	exit 1
+fi
 
 # if nothing is selected, select all
 if [ $configure -eq 0 -a $compile -eq 0 -a $pack -eq 0 ]
@@ -104,15 +177,47 @@ fi
 
 if [ $configure -eq 1 ]
 then
-	echo "paket=$paket" > debian/rules.pre
-#	shift
-	ARCH=""
-	cpp_build=0
+	# delete changelog and control
+	rm debian/changelog debian/control debian/README.debian debian/copyright 2>/dev/null || true
+	
+	# mconfigure builds 2 environment files: setenv.sh + rules.pre
+	echo "" > debian/rules.pre
+	if [ -e debian/setenv.sh ]; then rm debian/setenv.sh; fi
+	
+	if [ -n "$cross" ]
+	then
+		if [ ${cross:0:1} != "/" ]
+		then
+			cross="/opt/cross/$cross"
+			#export $cross
+		fi
+		if [ -f "$cross/setenv.sh" ]
+		then
+			. "$cross/setenv.sh"
+			cp $cross/setenv.sh debian/setenv.sh
+		fi
+		if [ -z "$ARCH" ]
+		then
+			# determine architecture
+			GNU_ARCH=${cross%-*} # assumed format: DEB_HOST_GNU_TYPE-g++version, e.g. arm-linux-gnueabihf-4.9
+			GNU_ARCH=${GNU_ARCH##*/}
+			arch_opt="-t $GNU_ARCH"
+		fi
+	fi
+
+	if [ -n "$ARCH" ]
+	then
+		arch_opt="-a $ARCH"
+	fi
+	dpkg-architecture $arch_opt >> debian/setenv.sh
+	
+	echo "paket=$paket" >> debian/setenv.sh
+	echo "oldpack=\"$oldpack\"" >> debian/setenv.sh
 
 	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)
@@ -133,32 +238,34 @@ then
 	fi
 
 	# check for pre/post installation scripts
+	echo "TODO: check for conffiles"
 	if [ -f $paket.preinst ]
 	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
-
-	mkdir -p tmp/DEBIAN
-
-	# load util functions for C/C++ - build
-	if [ -f $paket.cpp.sh ]
+	if [ -f $paket.postinst ]
+	then
+		    echo "add_inst_tgt += debian/tmp/DEBIAN/postinst" >> rules.pre
+	fi
+	if [ -f $paket.prerm ]
 	then
-		cpp_build=1
-		. projects/tools/make/c_configure.sh
-		. $paket.cpp.sh
+		    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
+	
+	# check for README.debian
+	if [ -f $paket.README.debian ]
+	then
+		    cp $paket.README.debian README.debian
+	fi
+	
+	mkdir -p tmp/DEBIAN
+
+	# add export to setenv.sh
+	sed -i "s/^/export /" setenv.sh
 
 	popd >/dev/null
 	# ./. ---------------------------------------------
@@ -166,39 +273,65 @@ 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
-		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
+		echo "warning: control file not found"
+		echo "  this file is necessary for any package production."
 	fi
 	
 	# build prepare
-	if [ -e debian/$paket.build ]
+	if [ -x debian/$paket.prepare ]
+	then
+		. debian/setenv.sh
+		debian/$paket.prepare
+	fi
+	# .build or .cmake
+	if [ -x debian/$paket.build -o -e debian/$paket.cmake ]
 	then
 		if [ -e ../build ]
 		then
 			rm -rf ../build
 			mkdir ../build
 		fi
-		debian/$paket.build -prepare
+		if grep -- "-prepare" debian/$paket.build >/dev/null
+		then			
+			echo "prepare in <paket>.build no longer supported. Use <paket>.prebuild"
+			exit 2
+		fi
+		# sync build dir
+		. debian/setenv.sh
+		debian/rules sync
+	fi
+	# .build
+	if [ -x debian/$paket.build ]
+	then
+		if [ -x debian/$paket.prebuild ]
+		then
+			pushd ../build >/dev/null
+				. debian/setenv.sh
+				debian/$paket.prebuild
+			popd >/dev/null
+		fi
+	fi
+	# .cmake
+	if [ -e debian/$paket.cmake ]
+	then
+		cmake_check
 	fi
 	
 	# pack prepare
-	if [ -f debian/$paket.cp -a -f $paket.control ]
+	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
@@ -207,20 +340,22 @@ then
 	fi
 fi
 
-if [ $compile -eq 1 -a ! -e debian/build.sh ]
-then
-	echo "no debian/build.sh: skipping build step"
-	compile=0
-fi
 if [ $compile -eq 1 ]
 then
-	# build artefacts
-	debian/rules build
+	if [ -x debian/$paket.build -o -e debian/$paket.cmake ]
+	then
+		# build package 
+		. debian/setenv.sh
+		debian/rules build
+	else
+		echo "skipping build step ..."
+	fi
 fi
 
 if [ $pack -eq 1 ]
 then
 	# build package
+	. debian/setenv.sh
 	debian/rules pack
 fi