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

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 8ce366e..f37f6a3 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,9 +2,29 @@
 set -e
 
 function echo_usage {
-	echo "usage: mconfigure <package> [options]"
+	echo "usage: mconfigure [options] <package>"
 	echo "	-a <arch>"
-	echo "	-p : prepare build, but not do it"
+	echo "	-c : configure"
+	echo "	-d : compile"
+	echo "	-p : pack default: do all"
+	echo "	-o : support old Debian 7 format"
+}
+
+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 {
@@ -13,24 +33,27 @@ function set_build {
 		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%%-*}
-		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
 	fi
 }
 
 function check_version {
+	
 	vline=$(head -1 debian/$paket.changelog)
 	vline=${vline%-*}
 	clversion=${vline#*(}
@@ -39,6 +62,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"
@@ -49,43 +79,26 @@ 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!"
+	echo "run mconfigure in the project base directory with a debian directory in it!"
 	exit 2
 fi
 
-paket=$1
-echo "export paket=$1" > debian/setenv.sh
-shift
-ARCH=""
-cpp_build=0
-
-set_build
-check_version
-echo "export version=$version" >> debian/setenv.sh
-echo "export build=$build" >> debian/setenv.sh
-
-# get repository name
-tmp=$(pwd)
-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
+configure=0
+compile=0
+pack=0
+while getopts "a:cdpo" opt; do
 	case $opt in
 		a) ARCH=$OPTARG
 			;;
-		p) prepare=1
+		c) configure=1
+			;;
+		d)	compile=1
+			;;
+		p)	pack=1
+			;;
+		o)	oldpack="-Zgzip"
 			;;
 		\?) echo "Invalid option: -$OPTARG"
 			echo_usage
@@ -97,107 +110,174 @@ while getopts ":ap" opt; do
 			;;
 	esac
 done
-#
-## clean dirs and check out
-#if [ -d build -a $delete_src -eq 1 ]
-#then
-#	rm -rf build
-#fi
-#
-
-pushd debian >/dev/null
-
-ln -sf /usr/share/mbuild/rules .
+shift $((OPTIND -1))
 
-#if [ -e tmp ]
-#then
-#	rm -rf tmp
-#fi
-#rm *.stamp 2>/dev/null || true
-#rm make.pre 2>/dev/null || true
+if [ $# -lt 1 ]
+then
+	echo_usage
+	exit 1
+fi
 
-mkdir -p tmp/DEBIAN
+paket=$1
 
-# load util functions for C/C++ - build
-if [ -f $paket.cpp.sh ]
+# if nothing is selected, select all
+if [ $configure -eq 0 -a $compile -eq 0 -a $pack -eq 0 ]
 then
-	cpp_build=1
-	. projects/tools/make/c_configure.sh
-	. $paket.cpp.sh
+	configure=1
+	compile=1
+	pack=1
 fi
 
-popd >/dev/null
-
-# copy package control
-if [ ! -f debian/control ]
+if [ $configure -eq 1 ]
 then
-	control=$(find etc -name $paket.control)
-	if [ -z "$control" ]
+	# delete changelog and control
+	rm debian/changelog debian/control 2>/dev/null || true
+	
+	# mconfigure builds 2 environment files: setenv.sh + rules.pre
+	
+	if [ -n "$ARCH" ]
 	then
-		echo "warning: control file not found"
-		echo "  this file is necessary for any package production."
-	else	
-		echo "Source: $pwd
+		arch_opt="-a $ARCH"
+	fi
+	dpkg-architecture $arch_opt > debian/setenv.sh
+	echo "" > debian/rules.pre
+	
+	echo "paket=$paket" >> debian/setenv.sh
+	echo "oldpack=\"$oldpack\"" >> debian/setenv.sh
+	cpp_build=0
+
+	set_build
+	check_version
+	echo "version=$version" >> debian/setenv.sh
+	echo "build=$build" >> debian/setenv.sh
+
+	# get repository name
+#	tmp=$(pwd)
+#	pwd=${tmp##*/}
+#	pwd=${pwd,,*}
+#	echo "pwd=$pwd" >> debian/rules.pre
+
+	echo "building $paket with build $version-$build"
+
+	pushd debian >/dev/null
+	# ./debian -------------------------------------
+
+	ln -sf /usr/share/mbuild/rules .
+
+	if [ -e tmp ]
+	then
+		rm -rf tmp
+	fi
+
+	# check for pre/post installation scripts
+	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
+	
+	#cat setenv.sh >> rules.pre
+
+	mkdir -p tmp/DEBIAN
+
+	# load util functions for C/C++ - build
+	if [ -f $paket.cpp.sh ]
+	then
+		cpp_build=1
+		. projects/tools/make/c_configure.sh
+		. $paket.cpp.sh
+	fi
+	
+	# add export to setenv.sh
+	sed -i "s/^/export /" setenv.sh
+
+	popd >/dev/null
+	# ./. ---------------------------------------------
+
+	# copy package control
+	if [ -f debian/$paket.control ]
+	then
+		# 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: $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
+	
+	# build prepare
+	if [ -e debian/$paket.build ]
+	then
+		if [ -e ../build ]
+		then
+			rm -rf ../build
+			mkdir ../build
+		fi
+		if grep -- "-prepare" debian/$paket.build >/dev/null
+		then
+			debian/rules sync
+			debian/$paket.build -prepare
+		fi
+	fi
+	
+	# pack prepare
+	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
+	else
+		echo "PACK=version" >> debian/rules.pre
 	fi
 fi
 
-if [ $prepare = 1 ]
+if [ $compile -eq 1 -a ! -e debian/$paket.build ]
 then
-	exit 0
+	echo "no debian/build.sh: skipping build step"
+	compile=0
+fi
+if [ $compile -eq 1 ]
+then
+	# build artefacts
+	. debian/setenv.sh
+	debian/rules build
 fi
 
-# check for copy file
-#if [ ! -f debian/$paket.cp ]
-#then
-#	# search for copy file
-#	copy=$(find . -name $paket.cp)
-#	if [ -n "$copy" ]
-#	then
-#		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)
-#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 ]
-#then
-#	cat  >>make.pre <<MAKE_PRE
-## mBuild make.pre script (auto generated)
-#project = $paket
-#COPY = ./$paket.cp
-#MAKE_PRE
-#	if [ -n "$ARCH" ]
-#	then
-#		echo "arch = $ARCH" >>make.pre
-#		echo "_arch = _${ARCH}" >>make.pre
-#	fi
-#	echo "make.pre written."
-#fi
-#
-## append version to make.pre
-#echo "version = $version" >> make.pre
-#echo "build = $build" >> make.pre
+if [ $pack -eq 1 ]
+then
+	# build package
+	. debian/setenv.sh
+	debian/rules pack
+fi