X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/2db0d888c5eefc4a7d7dfd7bc367db3e2679f3a4..5e8e2b2380cd6697b8634a765cdfd0b9e07c502c:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 9217fa1..b102ad7 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,61 +2,16 @@
 set -e
 
 function echo_usage {
-	echo "usage: mconfigure <package> [options]"
-	echo "	-a <arch>"
-	echo "	-c : configure only, no compile, pack"
-	echo "	-d : compile only"
-	echo "	-p : pack only"
+	echo "usage: mconfigure [options] <package>"
+	echo "	-c : copy configure/Makefile"
+	echo "	-d : compile"
+	echo "	-p : pack default: do all"
+	./configure -I
 }
 
-function set_build {
-	if [ -e .svn ]
-	then
-		version="0.0"
-		build=$(svnversion)
-		build=${build/:/-}
-	elif [ -e .git ]
-	then
-		tag=$(git describe --tags 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"
-		fi
-		version=${tag%%-*}
-		version=${version##*_}
-		build=${tag#*-}
-	fi
-}
-
-function check_version {
-	vline=$(head -1 debian/$paket.changelog)
-	vline=${vline%-*}
-	clversion=${vline#*(}
-	if [ $version = "0.0" ]
-	then
-		version=$clversion
-		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
+##############################################################################
+# Main program
+##############################################################################
 
 if [ ! -d debian ]
 then
@@ -64,123 +19,103 @@ then
 	exit 2
 fi
 
-paket=$1
-
-configure=1
-compile=1
-pack=1
-while getopts ":ap" opt; do
-	case $opt in
-		a) ARCH=$OPTARG
-			;;
-		c) compile=0
-			pack=0
-			;;
-		d)	configure=0
-			pack=0
-			;;
-		p)	configure=0
-			compile=0
-			;;
-		\?) echo "Invalid option: -$OPTARG"
-			echo_usage
-			exit 1
-			;;
-		:) echo "Option -$OPTARG requires an argument."
-			echo_usage
-			exit 1
-			;;
-	esac
+configure=0
+compile=0
+pack=0
+confirure_args="-b ../build"
+while [ $OPTIND -le "$#" ]
+do
+	if getopts "cdp" opt
+	then
+		case $opt in
+			c) configure=1
+				;;
+			d)	compile=1
+				;;
+			p)	pack=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 1
+				;;
+		esac
+	else
+		paket="${!OPTIND}"
+		eval OPTIND=OPTIND+1
+	fi
 done
 
-if [ $configure -eq 1 ]
+if [ -z "$paket" ]
 then
-	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"
-
-	pushd debian >/dev/null
-
-	ln -sf /usr/share/mbuild/rules .
-
-	#if [ -e tmp ]
-	#then
-	#	rm -rf tmp
-	#fi
-	#rm *.stamp 2>/dev/null || true
-	#rm make.pre 2>/dev/null || true
-
-	mkdir -p tmp/DEBIAN
+	echo_usage
+	exit 1
+fi
 
-	# load util functions for C/C++ - build
-	if [ -f $paket.cpp.sh ]
+if [ $configure -eq 1 ]
+then
+	# installation of configure file
+	cp /usr/share/mbuild/configure .
+else
+	if [ ! -e configure ]
 	then
-		cpp_build=1
-		. projects/tools/make/c_configure.sh
-		. $paket.cpp.sh
+		ln -s /usr/share/mbuild/configure .
 	fi
+fi
 
-	popd >/dev/null
+configure_args="$configure_args $paket"
+if [ -x debian/$paket.preconfigure ]
+then
+	# if necessary $configure_args can be added to setenv.sh
+	debian/$paket.preconfigure
+fi
 
-	# copy package control
-	if [ ! -f debian/control ]
+#-> configure
+# .build or .cmake
+if [ -x debian/$paket.build -o -e debian/$paket.cmake ]
+then
+	echo "BUILD_DIR=../build" >> debian/setenv.sh
+	if [ -e ../build ]
 	then
-		control=$(find etc -name $paket.control)
-		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
+		rm -rf ../build
+		mkdir ../build
 	fi
+	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
 
-# 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
+# perform configure
+. debian/setenv.sh
+./configure $configure_args
+
+# if nothing is selected, select all
+if [ $compile -eq 0 -a $pack -eq 0 ]
+then
+	compile=1
+	pack=1
+fi
 
 if [ $compile -eq 1 ]
 then
-	# build artefacts
-	. debian/setenv.sh
-	debian/rules build
+	# build
+	make
 fi
 
 if [ $pack -eq 1 ]
 then
 	# build package
-	. debian/setenv.sh
-	debian/rules binary
+	debian/rules pack
 fi