posaune

[projects.git] / tools / make / mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 5eca6fec0dc293f566b547037f8c02673b33ddfa..e94ead5ad1f5422fa8dea2a801ca54fc6a02822b 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -11,7 +11,7 @@ function echo_usage {
 
 function check_unversioned {
        # has to be called in the projects base directory
-       # result: "U" in stdout or nothing
+       # result: "M" in stdout or nothing
        
        project=$(pwd)
        project=${project##*/}
@@ -21,7 +21,7 @@ function check_unversioned {
                rm $project.batch
                if [ "${wc:0:5}" != "0 0 0" ]
                then
-                       echo "MU"
+                       echo "M"
                fi
        popd >/dev/null
 }
@@ -32,26 +32,24 @@ function set_build {
                version="0.0"
                build=$(svnversion)
                build=${build/:/-}
-               pushd .. >/dev/null
-                       build="$build$(check_unversioned)"
-               popd >/dev/null
+               build="$build$(check_unversioned)"
        elif [ -e .git ]
        then
                tag=$(git describe --tags 2>/dev/null) || true
                if test -z "$tag"
                then
-                       tag="0.0-TOP"
+                       tag="0.0-0TOP"
                fi
                tag_paket=${tag%_*}
                if [ "$tag_paket" != "$paket" ]
                then
-                       tag="0.0-TOP"
+                       tag="0.0-0TOP"
                fi
                changes=$(check_unversioned)
                tag="$tag$changes"
-               version=${tag%%-*}
+               version=${tag%-*}
                version=${version##*_}
-               build=${tag#*-}
+               build=${tag##*-}
        else
                echo "No configuration system found. Cannot determine version."
                exit 1
@@ -61,7 +59,7 @@ function set_build {
 function check_version {
        
        vline=$(head -1 debian/$paket.changelog)
-       vline=${vline%-*}
+       vline=${vline%[-)]*}
        clversion=${vline#*(}
        if [ $version = "0.0" ]
        then
@@ -103,7 +101,7 @@ configure=0
 compile=0
 pack=0
 shift
-while getopts ":acdp" opt; do
+while getopts "a:cdp" opt; do
        case $opt in
                a) ARCH=$OPTARG
                        ;;
@@ -135,17 +133,19 @@ fi
 if [ $configure -eq 1 ]
 then
        # delete changelog and control
-       rm debian/changelog debian/control || true
+       rm debian/changelog debian/control 2>/dev/null || true
        
        # mconfigure builds 2 environment files: setenv.sh + rules.pre
-       # setenv.sh is finally appended to rules.pre
        
-       dpkg-architecture > debian/setenv.sh
+       if [ -n "$ARCH" ]
+       then
+               arch_opt="-a $ARCH"
+       fi
+       dpkg-architecture $arch_opt > debian/setenv.sh
        echo "" > debian/rules.pre
        
        echo "paket=$paket" >> debian/setenv.sh
-#      shift
-       ARCH=""
+
        cpp_build=0
 
        set_build
@@ -189,7 +189,7 @@ then
                    echo "add_inst_tgt += debian/tmp/DEBIAN/postrm" >> rules.pre
        fi
        
-       cat setenv.sh >> rules.pre
+       #cat setenv.sh >> rules.pre
 
        mkdir -p tmp/DEBIAN
 
@@ -200,6 +200,9 @@ then
                . projects/tools/make/c_configure.sh
                . $paket.cpp.sh
        fi
+       
+       # add export to setenv.sh
+       sed -i "s/^/export /" setenv.sh
 
        popd >/dev/null
        # ./. ---------------------------------------------
@@ -218,10 +221,10 @@ then
                        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
+Section: main
+Priority: optional
+Maintainer: WagnerTech UG <mail@wagnertech.de>
+" > debian/$paket.control
                        grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control 
                fi
        fi
@@ -245,6 +248,14 @@ then
        if [ -f debian/$paket.cp -a -f debian/$paket.control ]
        then
                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
        elif [ -f debian/$paket.cp ]
        then
                echo "PACK=zip" >> debian/rules.pre