X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/69a6c876ef23b33f02b7fcf70b87c165a5a6a485..821fa83fccab0589fb06f6c111768dfcb78bf4f7:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index a5e9297..0d053b1 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,135 +2,214 @@
 set -e
 
 function echo_usage {
-	echo "usage: configure <package> [options]"
-	echo "	-a <arch>"
+	echo "usage: mconfigure [options] <package>"
+	echo "  -o: old style build (not recommended"
+	./configure -h
 }
 
-function set_build {
-	if [ -e .svn ]
+function create_conf {
+	if [ -f "debian/$paket.cmake" ]
 	then
-		build=$(svnversion)
-	elif [ -e .git ]
+		echo "compile_type=CMAKE" > debian/$paket.conf
+	elif [ -f "debian/$paket.build" ]
 	then
-		build=$(git describe --tags 2>/dev/null)
-		test -n "$build" || build="TOP"
-		changes=$(git status -s |grep "^ *M") || true
-		test -z "$changes" || build="${build}M"
+		if [ -f "debian/$paket.cpp" ]
+		then
+			echo "compile_type=CPP" > debian/$paket.conf
+		else
+			echo "compile_type=ANY" > debian/$paket.conf
+		fi
+	else
+		echo "compile_type=NONE" > debian/$paket.conf
 	fi
+	
+	if [ -f "$paket.control" -a -f "$paket.cp" ]
+	then
+		echo "target_type=DEB" >> debian/$paket.conf
+	else
+		echo "target_type=FILE" >> debian/$paket.conf
+	fi
+	echo "$paket.conf created."
 }
 
-# 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
+##############################################################################
+# Main program
+##############################################################################
 
-if [ $# -lt 1 ]
+if [ ! -d debian ]
 then
-	echo_usage
-	exit 1
+	echo "run mconfigure in the project base directory with a debian directory in it!"
+	exit 2
 fi
 
-paket=$1
-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
+configure=0
+configure_args="-i debian/tmp"
+while [ $OPTIND -le "$#" ]
+do
+	if getopts "o" opt
+	then
+		case $opt in
+			o) old_build=1
+				;;
+			\?) $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
 done
 
-# clean dirs and check out
-if [ -d build -a $delete_src -eq 1 ]
+if [ -z "$paket" ]
 then
-	rm -rf build
+	echo_usage
+	exit 4
 fi
 
-mkdir -p build
-pushd build >/dev/null
-
-ln -sf /usr/share/mbuild/makefile .
-
-if [ -e $paket ]
+if [ ! -f debian/$paket.conf ]
 then
-	rm -rf $paket
+	# check if any files for $paket are present
+	if ! ls debian/$paket.* 2>/dev/null
+	then
+		echo "$paket is no build target in this repository."
+		exit 5
+	fi
+	
+	# build conf file
+	echo "$paket.conf missing. We create it ..."
+	create_conf
 fi
-rm *.stamp || true
-rm make.pre || true
 
-# load util functions for C/C++ - build
-if [ -f $paket.cpp.sh ]
+if [ ! -e configure ]
 then
-	cpp_build=1
-	. projects/tools/make/c_configure.sh
-	. $paket.cpp.sh
+	ln -s /usr/share/mbuild/configure .
 fi
 
-# copy package control
-control=$(find -L src -name $paket.control)
-build_number=${build#*_}
-if [ -z "$control" ]
+# clean build directory
+if [ "$compile_type" != "NONE" ]
 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."
+	if [ -e ~/build ]
+	then
+		rm -rf ~/build
+		mkdir ~/build
+	fi
+	configure_args="$configure_args -d ~/build"
+fi
 
-	# extract version
-	version=$(grep Version $paket.control |sed "s/Version: //")
+# perform configure
+. debian/$paket.conf
+if [ -n $old_build ]
+then
+	rm debian/$paket.conf
 fi
 
-# check for copy file
-copy=$(find -L src -name $paket.cp)
-if [ -n "$copy" ]
+if [ "$compile_type" != "NONE" ]
 then
-	ln -sf $copy .
-else
-	echo "warning: file $paket.cp missing or not executable:"
-	echo "  this file is necessary for any package production."
+	configure_args="$configure_args -b"
+	if [ -n "$compile_dir" ]
+	then
+		configure_args="$configure_args -d $compile_dir"
+	fi
+	if [ -z "$compile_type" ]
+	then
+		echo "compile_type required in $paket.conf"
+		exit 51
+	fi
+	configure_args="$configure_args -c $compile_type"
+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
 
-# check for installation scripts
-files=$(find src -name $paket.preinst)
-files="$files $(find -L src -name $paket.postinst)"
-files="$files $(find -L src -name $paket.prerm)"
-files="$files $(find -L src -name $paket.postrm)"
-for file in $files
-do
-	ln -sf $file .
-done
+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
 
-# create generic make.pre, if not existing
-if [ ! -f make.pre ]
+# pack prepare
+if [ "$target_type" == "DEB" ]
 then
-	cat  >>make.pre <<MAKE_PRE
-# mBuild make.pre script (auto generated)
-project = $paket
-COPY = ./$paket.cp
-MAKE_PRE
-	if [ -n "$ARCH" ]
+	if [ ! -f debian/$paket.cp ]
 	then
-		echo "arch = $ARCH" >>make.pre
-		echo "_arch = _${ARCH}" >>make.pre
+		echo "debian/$paket.cp missing for target type DEB"
+		exit 9
 	fi
-	echo "make.pre written."
+	if [ ! -f debian/$paket.control ]
+	then
+		echo "debian/$paket.control missing for target type DEB"
+		exit 10
+	fi
+	
+	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
+	if ! [ -f debian/$paket.changelog ]
+	then
+		echo "changelog_source = debian/default.changelog" >> debian/rules.pre
+		if [ -f debian/default.changelog ]
+		then
+			rm debian/default.changelog
+		fi
+	fi
+elif [ "$target_type" == "ZIP" ]
+then
+	echo "PACK=zip" >> debian/rules.pre
+	if [ ! -f debian/$paket.cp ]
+	then
+		echo "debian/$paket.cp missing for target type ZIP"
+		exit 11
+	fi
+elif [ "$target_type" == "FILE" ]
+then
+	echo "PACK=version" >> debian/rules.pre
+	if [ "$compile_type" != "ANY" ]
+	then
+		if [ -z "$compile_target" ]
+		then
+			echo "compile_target is needed for target_type FILE"
+			exit 12
+		fi
+		echo "COMPILE_TARGET = $compile_target" >> debian/rules.pre
+		if [ -n "$target_name" ]
+		then
+			echo "TARGET = $target_name" >> debian/rules.pre
+		else
+			echo "TARGET = $paket" >> debian/rules.pre
+		fi
+	fi
+else
+	echo "Unknown target type: $target_type"
+	exit 13
 fi
 
-# append version to make.pre
-echo "version = $version" >> make.pre
-echo "build = $build" >> make.pre
+# build package
+debian/rules pack