X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/290f9a4e182a7c7a89765e58c9ba477be4fc4732..0b8ae20fd3339cdb7b02aa37ec295cb0ceca6380:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index a1ea508..dda9b97 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,282 +2,160 @@
 set -e
 
 function echo_usage {
-	echo "usage: mconfigure <package> [options]"
-	echo "	-a <arch>"
-	echo "	-c : configure"
-	echo "	-d : compile"
-	echo "	-p : pack default: do all"
-	echo "  -o : support old Debian 7 format"
+	echo "usage: mconfigure [options] <package>"
+	./configure -I
 }
 
-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 {
-	if [ -e .svn ]
-	then
-		version="0.0"
-		build=$(svnversion)
-		build=${build/:/-}
-		build="$build$(check_unversioned)"
-	elif [ -e .git ]
-	then
-		tag=$(git describe --tags --match "${paket}_*" 2>/dev/null) || true
-		if test -z "$tag"
-		then
-			tag="0.0-0TOP"
-		fi
-		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#*(}
-	if [ $version = "0.0" ]
-	then
-		version=$clversion
-		return
-	fi
+##############################################################################
+# Main program
+##############################################################################
 
-	# do no check on a modified git repos
-	if [ "${build: -1}" == "M" ]
-	then
-		return
-	fi
+if [ ! -d debian ]
+then
+	echo "run mconfigure in the project base directory with a debian directory in it!"
+	exit 2
+fi
 
-	if [ "$clversion" != $version ]
-	then
-		echo "version mismatch: git: $version, changelog: $clversion"
-		exit 1
+configure=0
+configure_args="-i debian/tmp"
+while [ $OPTIND -le "$#" ]
+do
+	if getopts "c" opt
+	then
+		case $opt in
+			\?) $confirure_args="$configure_ars -$OPTARG"
+				if [ $OPTARG="a" -o $OPTARG="C" -o $OPTARG="i" -o $OPTARG="v" ]
+				then
+					eval OPTIND=OPTIND+1
+					$confirure_args="$configure_ars ${!OPTIND}"
+				fi
+				;;
+			:) echo "Option -$OPTARG requires an argument."
+				echo_usage
+				exit 3
+				;;
+		esac
+	else
+		paket="${!OPTIND}"
+		eval OPTIND=OPTIND+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
+done
 
-if [ $# -lt 1 ]
+if [ -z "$paket" ]
 then
 	echo_usage
-	exit 1
+	exit 4
 fi
 
-if [ ! -d debian ]
+if [ ! -f debian/$paket.conf ]
 then
-	echo "run mconfigure in the project base directory with a debian directory in it!"
-	exit 2
+	echo "$paket.conf missing. We create it ..."
+	echo "to be implemented ..."
+	exit 5
 fi
 
-paket=$1
-
-configure=0
-compile=0
-pack=0
-shift
-while getopts "a:cdpo" opt; do
-	case $opt in
-		a) ARCH=$OPTARG
-			;;
-		c) configure=1
-			;;
-		d)	compile=1
-			;;
-		p)	pack=1
-			;;
-		o)	oldpack="-Zgzip"
-			;;
-		\?) echo "Invalid option: -$OPTARG"
-			echo_usage
-			exit 1
-			;;
-		:) echo "Option -$OPTARG requires an argument."
-			echo_usage
-			exit 1
-			;;
-	esac
-done
-
-# if nothing is selected, select all
-if [ $configure -eq 0 -a $compile -eq 0 -a $pack -eq 0 ]
+if [ ! -e configure ]
 then
-	configure=1
-	compile=1
-	pack=1
+	ln -s /usr/share/mbuild/configure .
 fi
 
-if [ $configure -eq 1 ]
+# clean build directory
+if [ "$compile_type" != "NONE" ]
 then
-	# 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" ]
+	if [ -e ~/build ]
 	then
-		arch_opt="-a $ARCH"
+		rm -rf ~/build
+		mkdir ~/build
 	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 -------------------------------------
+fi
 
-	ln -sf /usr/share/mbuild/rules .
+# perform configure
+. debian/$paket.conf
+if [ -n "$compile_dir" ]
+then
+	configure_args="$configure_args -b $compile_dir"
+fi
+if [ -z "$compile_type" ]
+then
+	echo "compile_type required in $paket.conf"
+	exit 51
+fi
+if [ "$target_type" == "FILE" ]
+then
+	# no version needed
+	configure_args="$configure_args -V"
+fi
+configure_args="$configure_args $paket"
+echo "Executing ./configure $configure_args ..."
+./configure $configure_args
 
-	if [ -e tmp ]
-	then
-		rm -rf tmp
+if [ "$compile_type" != "NONE" ]
+then
+	if grep -- "-prepare" debian/$paket.build >/dev/null
+	then			
+		echo "prepare in <paket>.build no longer supported. Use <paket>.prebuild"
+		exit 6
 	fi
+	# sync build dir
+	. debian/setenv.sh
+	debian/rules sync
+	make
+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 ]
+# pack prepare
+if [ "$target_type" == "DEB" ]
+then
+	if [ ! -f debian/$paket.cp ]
 	then
-		    echo "add_inst_tgt += debian/tmp/DEBIAN/prerm" >> rules.pre
+		echo "debian/$paket.cp missing for target type DEB"
+		exit 9
 	fi
-	if [ -f $paket.postrm ]
+	if [ ! -f debian/$paket.control ]
 	then
-		    echo "add_inst_tgt += debian/tmp/DEBIAN/postrm" >> rules.pre
+		echo "debian/$paket.control missing for target type DEB"
+		exit 10
 	fi
 	
-	#cat setenv.sh >> rules.pre
-
-	mkdir -p tmp/DEBIAN
-
-	# load util functions for C/C++ - build
-	if [ -f $paket.cpp.sh ]
+	echo "PACK=binary" >> debian/rules.pre
+	if grep "^Architecture: *all" debian/$paket.control >/dev/null
 	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
+		echo "arch = all" >> debian/rules.pre
+		echo 'BINARY_INDEP = copy ../$(paket)_$(version)-$(build)_all.deb' >> debian/rules.pre
 	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/$paket.control
-			grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control 
-		fi
+		echo 'arch = ${DEB_HOST_ARCH}' >> debian/rules.pre
+		echo "BINARY_ARCH = copy ../${paket}_$version-${build}_"'$(arch).deb' >> debian/rules.pre
 	fi
-	
-	# build prepare
-	if [ -e debian/$paket.build ]
+	if ! [ -f debian/$paket.changelog ]
 	then
-		if [ -e ../build ]
-		then
-			rm -rf ../build
-			mkdir ../build
-		fi
-		if grep -- "-prepare" debian/$paket.build >/dev/null
+		echo "changelog_source = debian/default.changelog" >> debian/rules.pre
+		if [ -f debian/default.changelog ]
 		then
-			debian/rules sync
-			debian/$paket.build -prepare
+			rm debian/default.changelog
 		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 ]
+elif [ "$target_type" == "ZIP" ]
+then
+	echo "PACK=zip" >> debian/rules.pre
+	if [ ! -f debian/$paket.cp ]
 	then
-		echo "PACK=zip" >> debian/rules.pre
-	else
-		echo "PACK=version" >> debian/rules.pre
+		echo "debian/$paket.cp missing for target type ZIP"
+		exit 11
 	fi
-fi
-
-if [ $compile -eq 1 -a ! -e debian/$paket.build ]
-then
-	echo "no debian/build.sh: skipping build step"
-	compile=0
-fi
-if [ $compile -eq 1 ]
+elif [ "$target_type" == "FILE" ]
 then
-	# build artefacts
-	. debian/setenv.sh
-	debian/rules build
+	echo "PACK=version" >> debian/rules.pre
+	if [ -z "$compile_target" ]
+	then
+		echo "compile_target is needed for target_type FILE"
+		exit 12
+	fi
+	echo "TARGET = $compile_target" >> debian/rules.pre
+	
+else
+	echo "Unknown target type: $target_type"
+	exit 13
 fi
 
-if [ $pack -eq 1 ]
-then
-	# build package
-	. debian/setenv.sh
-	debian/rules pack
-fi
+# build package
+debian/rules pack