posaune

[projects.git] / tools / make / mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 09b6d3d7dfbc6e723a0dfa890862a4af51a5aca6..f37f6a3d5ccd772e8bba050b2cea5bf1cfaeee32 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,11 +2,12 @@
 set -e
 
 function echo_usage {
 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 "  -a <arch>"
        echo "  -c : configure"
        echo "  -d : compile"
        echo "  -p : pack default: do all"

+       echo "  -o : support old Debian 7 format"

 }
 
 function check_unversioned {
 }
 
 function check_unversioned {


@@ -35,16 +36,11 @@ function set_build {
                build="$build$(check_unversioned)"
        elif [ -e .git ]
        then
                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-0TOP"
                fi
                if test -z "$tag"
                then
                        tag="0.0-0TOP"
                fi

-               tag_paket=${tag%_*}
-               if [ "$tag_paket" != "$paket" ]
-               then
-                       tag="0.0-0TOP"
-               fi

                changes=$(check_unversioned)
                tag="$tag$changes"
                version=${tag%-*}
                changes=$(check_unversioned)
                tag="$tag$changes"
                version=${tag%-*}


@@ -83,25 +79,16 @@ function check_version {
 # <package>.cp (optional): copy step for package production
 # <package>.cpp.sh (optional): commands to setup the C++ compile environment
 
 # <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
        echo "run mconfigure in the project base directory with a debian directory in it!"
        exit 2
 fi
 
 if [ ! -d debian ]
 then
        echo "run mconfigure in the project base directory with a debian directory in it!"
        exit 2
 fi
 

-paket=$1
-

 configure=0
 compile=0
 pack=0
 configure=0
 compile=0
 pack=0

-shift
-while getopts "a:cdp" opt; do
+while getopts "a:cdpo" opt; do

        case $opt in
                a) ARCH=$OPTARG
                        ;;
        case $opt in
                a) ARCH=$OPTARG
                        ;;


@@ -111,6 +98,8 @@ while getopts "a:cdp" opt; do
                        ;;
                p)      pack=1
                        ;;
                        ;;
                p)      pack=1
                        ;;

+               o)      oldpack="-Zgzip"
+                       ;;

                \?) echo "Invalid option: -$OPTARG"
                        echo_usage
                        exit 1
                \?) echo "Invalid option: -$OPTARG"
                        echo_usage
                        exit 1


@@ -121,6 +110,15 @@ while getopts "a:cdp" opt; do
                        ;;
        esac
 done
                        ;;
        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 ]
 
 # if nothing is selected, select all
 if [ $configure -eq 0 -a $compile -eq 0 -a $pack -eq 0 ]


@@ -133,7 +131,7 @@ fi
 if [ $configure -eq 1 ]
 then
        # delete changelog and control
 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
        
        
        # mconfigure builds 2 environment files: setenv.sh + rules.pre
        


@@ -145,7 +143,7 @@ then
        echo "" > debian/rules.pre
        
        echo "paket=$paket" >> debian/setenv.sh
        echo "" > debian/rules.pre
        
        echo "paket=$paket" >> debian/setenv.sh

-
+       echo "oldpack=\"$oldpack\"" >> debian/setenv.sh

        cpp_build=0
 
        set_build
        cpp_build=0
 
        set_build