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

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 3bca62a..9217fa1 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -4,7 +4,9 @@ set -e
 function echo_usage {
 	echo "usage: mconfigure <package> [options]"
 	echo "	-a <arch>"
-	echo "	-p : prepare build, but not do it"
+	echo "	-c : configure only, no compile, pack"
+	echo "	-d : compile only"
+	echo "	-p : pack only"
 }
 
 function set_build {
@@ -12,6 +14,7 @@ function set_build {
 	then
 		version="0.0"
 		build=$(svnversion)
+		build=${build/:/-}
 	elif [ -e .git ]
 	then
 		tag=$(git describe --tags 2>/dev/null) || true
@@ -20,23 +23,25 @@ function set_build {
 			tag="0.0-TOP"
 		fi
 		changes=$(git status -s |grep "^ *M") || true
-		if test -z "$changes"
+		if test -n "$changes"
 		then
 			tag="${tag}M"
 		fi
-		version=${tag%-*}
+		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
-	vline=$(head -1 debian/$paket.changelog)
-	vline=${vline%-*}
-	clversion=${vline#*(}
 	if [ "$clversion" != $version ]
 	then
 		echo "version mismatch: git: $version, changelog: $clversion"
@@ -55,33 +60,27 @@ fi
 
 if [ ! -d debian ]
 then
-	echo "run mconfigure in the project base directory!"
+	echo "run mconfigure in the project base directory with a debian directory in it!"
 	exit 2
 fi
 
-echo "export paket=$1" > debian/setenv.sh
-shift
-ARCH=""
-cpp_build=0
+paket=$1
 
-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
+configure=1
+compile=1
+pack=1
 while getopts ":ap" opt; do
 	case $opt in
 		a) ARCH=$OPTARG
 			;;
-		p) prepare=1
+		c) compile=0
+			pack=0
+			;;
+		d)	configure=0
+			pack=0
+			;;
+		p)	configure=0
+			compile=0
 			;;
 		\?) echo "Invalid option: -$OPTARG"
 			echo_usage
@@ -93,102 +92,95 @@ while getopts ":ap" opt; do
 			;;
 	esac
 done
-#
-## clean dirs and check out
-#if [ -d build -a $delete_src -eq 1 ]
-#then
-#	rm -rf build
-#fi
-#
 
-pushd debian >/dev/null
+if [ $configure -eq 1 ]
+then
+	echo "export paket=$1" > debian/setenv.sh
+	shift
+	ARCH=""
+	cpp_build=0
 
-ln -sf /usr/share/mbuild/rules .
+	set_build
+	check_version
+	echo "export version=$version" >> debian/setenv.sh
+	echo "export build=$build" >> debian/setenv.sh
 
-#if [ -e tmp ]
-#then
-#	rm -rf tmp
-#fi
-#rm *.stamp 2>/dev/null || true
-#rm make.pre 2>/dev/null || true
+	# get repository name
+	tmp=$(pwd)
+	pwd=${tmp##*/}
+	pwd=${pwd,,*}
+	echo "export pwd=$pwd" >> debian/setenv.sh
 
-mkdir -p tmp/DEBIAN
+	echo "building $paket with build $version-$build"
 
-# load util functions for C/C++ - build
-if [ -f $paket.cpp.sh ]
-then
-	cpp_build=1
-	. projects/tools/make/c_configure.sh
-	. $paket.cpp.sh
-fi
+	pushd debian >/dev/null
 
-# 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
+	ln -sf /usr/share/mbuild/rules .
 
-popd >/dev/null
+	#if [ -e tmp ]
+	#then
+	#	rm -rf tmp
+	#fi
+	#rm *.stamp 2>/dev/null || true
+	#rm make.pre 2>/dev/null || true
 
-if [ $prepare = 1 ]
-then
-	exit 0
-fi
+	mkdir -p tmp/DEBIAN
+
+	# load util functions for C/C++ - build
+	if [ -f $paket.cpp.sh ]
+	then
+		cpp_build=1
+		. projects/tools/make/c_configure.sh
+		. $paket.cpp.sh
+	fi
+
+	popd >/dev/null
 
-# build package
-. debian/setenv.sh
-debian/rules binary
+	# copy package control
+	if [ ! -f debian/control ]
+	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
+	fi
+fi
 
-## check for copy file
-#if [ ! -f $paket.cp ]
+# check for copy file
+#if [ ! -f debian/$paket.cp ]
 #then
 #	# search for copy file
-#	copy=$(find .. -name $paket.cp)
+#	copy=$(find . -name $paket.cp)
 #	if [ -n "$copy" ]
 #	then
-#		ln -sf $copy .
+#		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
-#
-## 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
+
+if [ $compile -eq 1 ]
+then
+	# build artefacts
+	. debian/setenv.sh
+	debian/rules build
+fi
+
+if [ $pack -eq 1 ]
+then
+	# build package
+	. debian/setenv.sh
+	debian/rules binary
+fi