X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/9b5a94ef108feb2c9e0ed7492c4fc40813350cbc..40ce709909bf3094e77db91b111035ac0bd0ce54:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index f745eff..438321e 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -4,9 +4,9 @@ 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 "	-c : configure"
+	echo "	-d : compile"
+	echo "	-p : pack default: do all"
 }
 
 function set_build {
@@ -30,6 +30,9 @@ function set_build {
 		version=${tag%%-*}
 		version=${version##*_}
 		build=${tag#*-}
+	else
+		echo "No configuration system found. Cannot determine version."
+		exit 1
 	fi
 }
 
@@ -66,21 +69,19 @@ fi
 
 paket=$1
 
-configure=1
-compile=1
-pack=1
-while getopts ":ap" opt; do
+configure=0
+compile=0
+pack=0
+shift
+while getopts ":acdp" opt; do
 	case $opt in
 		a) ARCH=$OPTARG
 			;;
-		c) compile=0
-			pack=0
+		c) configure=1
 			;;
-		d)	configure=0
-			pack=0
+		d)	compile=1
 			;;
-		p)	configure=0
-			compile=0
+		p)	pack=1
 			;;
 		\?) echo "Invalid option: -$OPTARG"
 			echo_usage
@@ -93,27 +94,36 @@ while getopts ":ap" opt; do
 	esac
 done
 
+# if nothing is selected, select all
+if [ $configure -eq 0 -a $compile -eq 0 -a $pack -eq 0 ]
+then
+	configure=1
+	compile=1
+	pack=1
+fi
+
 if [ $configure -eq 1 ]
 then
-	echo "export paket=$1" > debian/setenv.sh
-	shift
+	echo "paket=$paket" > debian/rules.pre
+#	shift
 	ARCH=""
 	cpp_build=0
 
 	set_build
 	check_version
-	echo "export version=$version" >> debian/setenv.sh
-	echo "export build=$build" >> debian/setenv.sh
+	echo "version=$version" >> debian/rules.pre
+	echo "build=$build" >> debian/rules.pre
 
 	# get repository name
-	tmp=$(pwd)
-	pwd=${tmp##*/}
-	pwd=${pwd,,*}
-	echo "export pwd=$pwd" >> debian/setenv.sh
+#	tmp=$(pwd)
+#	pwd=${tmp##*/}
+#	pwd=${pwd,,*}
+#	echo "pwd=$pwd" >> debian/rules.pre
 
 	echo "building $paket with build $version-$build"
 
 	pushd debian >/dev/null
+	# ./debian -------------------------------------
 
 	ln -sf /usr/share/mbuild/rules .
 
@@ -121,8 +131,24 @@ then
 	then
 		rm -rf tmp
 	fi
-	#rm *.stamp 2>/dev/null || true
-	#rm make.pre 2>/dev/null || true
+
+	# check for pre/post installation scripts
+	if [ -f $paket.preinst ]
+	then
+		echo "add_inst_tgt += debian/tmp/DEBIAN/preinst" >> rules.pre
+	fi
+        if [ -f $paket.postinst ]
+        then
+                echo "add_inst_tgt += debian/tmp/DEBIAN/postinst" >> rules.pre
+        fi
+        if [ -f $paket.prerm ]
+        then
+                echo "add_inst_tgt += debian/tmp/DEBIAN/prerm" >> rules.pre
+        fi
+        if [ -f $paket.postrm ]
+        then
+                echo "add_inst_tgt += debian/tmp/DEBIAN/postrm" >> rules.pre
+        fi
 
 	mkdir -p tmp/DEBIAN
 
@@ -135,6 +161,7 @@ then
 	fi
 
 	popd >/dev/null
+	# ./. ---------------------------------------------
 
 	# copy package control
 	if [ ! -f debian/control ]
@@ -170,17 +197,20 @@ fi
 #	fi
 #fi
 
+if [ ! -e debian/build.sh ]
+then
+	echo "no debian/build.sh: skipping build step"
+	compile=0
+fi
 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