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

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 3bca62a..dda9b97 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,193 +2,160 @@
 set -e
 
 function echo_usage {
-	echo "usage: mconfigure <package> [options]"
-	echo "	-a <arch>"
-	echo "	-p : prepare build, but not do it"
+	echo "usage: mconfigure [options] <package>"
+	./configure -I
 }
 
-function set_build {
-	if [ -e .svn ]
-	then
-		version="0.0"
-		build=$(svnversion)
-	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 -z "$changes"
-		then
-			tag="${tag}M"
-		fi
-		version=${tag%-*}
-		build=${tag#*-}
-	fi
-}
+##############################################################################
+# Main program
+##############################################################################
 
-function check_version {
-	if [ $version = "0.0" ]
-	then
-		return
-	fi
-	vline=$(head -1 debian/$paket.changelog)
-	vline=${vline%-*}
-	clversion=${vline#*(}
-	if [ "$clversion" != $version ]
+if [ ! -d debian ]
+then
+	echo "run mconfigure in the project base directory with a debian directory in it!"
+	exit 2
+fi
+
+configure=0
+configure_args="-i debian/tmp"
+while [ $OPTIND -le "$#" ]
+do
+	if getopts "c" opt
 	then
-		echo "version mismatch: git: $version, changelog: $clversion"
-		exit 1
+		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!"
-	exit 2
+	echo "$paket.conf missing. We create it ..."
+	echo "to be implemented ..."
+	exit 5
 fi
 
-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##*/}
-echo "export pwd=$pwd" >> debian/setenv.sh
-
-echo "building $paket with build $version-$build"
-
-prepare=0
-while getopts ":ap" opt; do
-	case $opt in
-		a) ARCH=$OPTARG
-			;;
-		p) prepare=1
-			;;
-		\?) 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
+if [ ! -e configure ]
+then
+	ln -s /usr/share/mbuild/configure .
+fi
 
-# load util functions for C/C++ - build
-if [ -f $paket.cpp.sh ]
+# clean build directory
+if [ "$compile_type" != "NONE" ]
 then
-	cpp_build=1
-	. projects/tools/make/c_configure.sh
-	. $paket.cpp.sh
+	if [ -e ~/build ]
+	then
+		rm -rf ~/build
+		mkdir ~/build
+	fi
 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
+# 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
 
-popd >/dev/null
+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
 
-if [ $prepare = 1 ]
+# pack prepare
+if [ "$target_type" == "DEB" ]
 then
-	exit 0
+	if [ ! -f debian/$paket.cp ]
+	then
+		echo "debian/$paket.cp missing for target type DEB"
+		exit 9
+	fi
+	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 [ -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
 
 # build package
-. debian/setenv.sh
-debian/rules binary
-
-## 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
-
-# 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
+debian/rules pack