posaune

[projects.git] / tools / make / mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 4313e46..a1ea508 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -7,6 +7,24 @@ function echo_usage {
        echo "  -c : configure"
        echo "  -d : compile"
        echo "  -p : pack default: do all"
+       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
+       
+       project=$(pwd)
+       project=${project##*/}
+       pushd .. >/dev/null
+               mCM $project -b -an > /dev/null
+               wc=$(wc $project.batch)
+               rm $project.batch
+               if [ "${wc:0:5}" != "0 0 0" ]
+               then
+                       echo "M"
+               fi
+       popd >/dev/null
 }
 
 function set_build {
@@ -15,26 +33,19 @@ function set_build {
                version="0.0"
                build=$(svnversion)
                build=${build/:/-}
+               build="$build$(check_unversioned)"
        elif [ -e .git ]
        then
-               tag=$(git describe --tags 2>/dev/null) || true
+               tag=$(git describe --tags --match "${paket}_*" 2>/dev/null) || true
                if test -z "$tag"
                then
-                       tag="0.0-TOP"
-               fi
-               tag_paket=${tag%_*}
-               if [ "$tag_paket" != "$paket" ]
-               then
-                       tag="0.0-TOP"
+                       tag="0.0-0TOP"
                fi
-               changes=$(git status -s |grep "^ *M") || true
-               if test -n "$changes"
-               then
-                       tag="${tag}M"
-               fi
-               version=${tag%%-*}
+               changes=$(check_unversioned)
+               tag="$tag$changes"
+               version=${tag%-*}
                version=${version##*_}
-               build=${tag#*-}
+               build=${tag##*-}
        else
                echo "No configuration system found. Cannot determine version."
                exit 1
@@ -86,7 +97,7 @@ configure=0
 compile=0
 pack=0
 shift
-while getopts ":acdp" opt; do
+while getopts "a:cdpo" opt; do
        case $opt in
                a) ARCH=$OPTARG
                        ;;
@@ -96,6 +107,8 @@ while getopts ":acdp" opt; do
                        ;;
                p)      pack=1
                        ;;
+               o)      oldpack="-Zgzip"
+                       ;;
                \?) echo "Invalid option: -$OPTARG"
                        echo_usage
                        exit 1
@@ -118,17 +131,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=""
+       echo "oldpack=\"$oldpack\"" >> debian/setenv.sh
        cpp_build=0
 
        set_build
@@ -172,7 +187,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
 
@@ -183,6 +198,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
        # ./. ---------------------------------------------
@@ -201,10 +219,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
@@ -228,6 +246,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