posaune

[projects.git] / tools / make / mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index a1ea508..e128871 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,18 +2,19 @@
 set -e
 
 function echo_usage {
-       echo "usage: mconfigure <package> [options]"
+       echo "usage: mconfigure [options] <package>"
        echo "  -a <arch>"
        echo "  -c : configure"
        echo "  -d : compile"
        echo "  -p : pack default: do all"
-       echo "  -o : support old Debian 7 format"
+       echo "  -o : support old Debian 7 format"
 }
 
 function check_unversioned {
        # has to be called in the projects base directory
        # result: "M" in stdout or nothing
        
+       set -e
        project=$(pwd)
        project=${project##*/}
        pushd .. >/dev/null
@@ -28,6 +29,7 @@ function check_unversioned {
 }
 
 function set_build {
+       set -e
        if [ -e .svn ]
        then
                version="0.0"
@@ -53,6 +55,7 @@ function set_build {
 }
 
 function check_version {
+       set -e
        
        vline=$(head -1 debian/$paket.changelog)
        vline=${vline%-*}
@@ -75,15 +78,6 @@ function check_version {
                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
 
 if [ ! -d debian ]
 then
@@ -91,12 +85,9 @@ then
        exit 2
 fi
 
-paket=$1
-
 configure=0
 compile=0
 pack=0
-shift
 while getopts "a:cdpo" opt; do
        case $opt in
                a) ARCH=$OPTARG
@@ -119,6 +110,15 @@ while getopts "a:cdpo" opt; do
                        ;;
        esac
 done
+shift $((OPTIND -1))
+
+if [ $# -lt 1 ]
+then
+       echo_usage
+       exit 1
+fi
+
+paket=$1
 
 # if nothing is selected, select all
 if [ $configure -eq 0 -a $compile -eq 0 -a $pack -eq 0 ]
@@ -144,7 +144,6 @@ then
        
        echo "paket=$paket" >> debian/setenv.sh
        echo "oldpack=\"$oldpack\"" >> debian/setenv.sh
-       cpp_build=0
 
        set_build
        check_version
@@ -187,18 +186,8 @@ then
                    echo "add_inst_tgt += debian/tmp/DEBIAN/postrm" >> rules.pre
        fi
        
-       #cat setenv.sh >> rules.pre
-
        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
-       
        # add export to setenv.sh
        sed -i "s/^/export /" setenv.sh
 
@@ -211,23 +200,16 @@ then
                # proceed
                echo
        else
-               # try old fashoned way
-               control=$(find etc -name $paket.control) || true
-               if [ -z "$control" ]
-               then
-                       echo "warning: control file not found"
-                       echo "  this file is necessary for any package production."
-               else    
-                       echo "Source: $paket
-Section: main
-Priority: optional
-Maintainer: WagnerTech UG <mail@wagnertech.de>
-" > debian/$paket.control
-                       grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control 
-               fi
+               echo "warning: control file not found"
+               echo "  this file is necessary for any package production."
        fi
        
        # build prepare
+       if [ -x debian/$paket.prepare ]
+       then
+               . debian/setenv.sh
+               debian/$paket.prepare
+       fi
        if [ -e debian/$paket.build ]
        then
                if [ -e ../build ]
@@ -240,6 +222,17 @@ Maintainer: WagnerTech UG <mail@wagnertech.de>
                        debian/rules sync
                        debian/$paket.build -prepare
                fi
+               # sync build dir
+               . debian/setenv.sh
+               debian/rules sync
+               
+               # executing prebuild
+               if [ -x debian/$paket.prebuild ]
+               then
+                       pushd ~/build >/dev/null
+                       debian/$paket.prebuild
+                       popd >/dev/null
+               fi
        fi
        
        # pack prepare
@@ -264,7 +257,7 @@ fi
 
 if [ $compile -eq 1 -a ! -e debian/$paket.build ]
 then
-       echo "no debian/build.sh: skipping build step"
+       echo "no debian/$paket.build: skipping build step"
        compile=0
 fi
 if [ $compile -eq 1 ]