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

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index d329219..b102ad7 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,163 +2,120 @@
 set -e
 
 function echo_usage {
-	echo "usage: mconfigure <package> [options]"
-	echo "	-a <arch>"
+	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
-		build=$(svnversion)
-	elif [ -e .git ]
+##############################################################################
+# Main program
+##############################################################################
+
+if [ ! -d debian ]
+then
+	echo "run mconfigure in the project base directory with a debian directory in it!"
+	exit 2
+fi
+
+configure=0
+compile=0
+pack=0
+confirure_args="-b ../build"
+while [ $OPTIND -le "$#" ]
+do
+	if getopts "cdp" opt
 	then
-		build=$(git describe --tags 2>/dev/null) || true
-		if test -z "$build"
-		then
-			build="0.0-TOP"
-		fi
-		changes=$(git status -s |grep "^ *M") || true
-		if test -z "$changes"
-		then
-			build="${build}M"
-		fi
+		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
-}
-
-# 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
 fi
 
-if [ ! -d debian ]
+if [ $configure -eq 1 ]
 then
-	echo "run mconfigure in the project base directory!"
-	exit 2
+	# installation of configure file
+	cp /usr/share/mbuild/configure .
+else
+	if [ ! -e configure ]
+	then
+		ln -s /usr/share/mbuild/configure .
+	fi
 fi
 
-export paket=$1
-shift
-ARCH=""
-cpp_build=0
-
-set_build
-export build
-
-# get repository name
-tmp=$(pwd)
-export pwd=${tmp##*/}
-
-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
-#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 .
-
-#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
-
-# load util functions for C/C++ - build
-if [ -f $paket.cpp.sh ]
+configure_args="$configure_args $paket"
+if [ -x debian/$paket.preconfigure ]
 then
-	cpp_build=1
-	. projects/tools/make/c_configure.sh
-	. $paket.cpp.sh
+	# if necessary $configure_args can be added to setenv.sh
+	debian/$paket.preconfigure
 fi
 
-# copy package control
-#control=$(find .. -name $paket.control)
-#build_number=${build#*_}
-#if [ -z "$control" ]
-#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."
-#
-#	# extract version
-#	version=$(grep Version $paket.control |sed "s/Version: //")
-#fi
+#-> 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
+		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
 
-popd >/dev/null
+# perform configure
+. debian/setenv.sh
+./configure $configure_args
 
-# build package
-debian/rules binary
+# if nothing is selected, select all
+if [ $compile -eq 0 -a $pack -eq 0 ]
+then
+	compile=1
+	pack=1
+fi
 
-## check for copy file
-#if [ ! -f $paket.cp ]
-#then
-#	# search for copy file
-#	copy=$(find .. -name $paket.cp)
-#	if [ -n "$copy" ]
-#	then
-#		ln -sf $copy .
-#	else
-#		echo "warning: file $paket.cp missing or not executable:"
-#		echo "  this file is necessary for any package production."
-#	fi
-#fi
-#
-## 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
+if [ $compile -eq 1 ]
+then
+	# build
+	make
+fi
 
-# 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/rules pack
+fi