]> wagnertech.de Git - projects.git/blobdiff - tools/make/mconfigure
projects / projects.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
posaune
[projects.git] / tools / make / mconfigure
diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index a6e919d46a75b6923a2e73bf4077d811b7d2fbb8..f37f6a3d5ccd772e8bba050b2cea5bf1cfaeee32 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,11 +2,29 @@
 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 {
+       # 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 {
 }
 
 function set_build {
@@ -15,26 +33,19 @@ function set_build {
                version="0.0"
                build=$(svnversion)
                build=${build/:/-}
                version="0.0"
                build=$(svnversion)
                build=${build/:/-}
+               build="$build$(check_unversioned)"
        elif [ -e .git ]
        then
        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
                if test -z "$tag"
                then
-                       tag="0.0-TOP"
+                       tag="0.0-0TOP"
                fi
                fi
-               tag_paket=${tag%_*}
-               if [ "$tag_paket" != "$paket" ]
-               then
-                       tag="0.0-TOP"
-               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##*_}
                version=${version##*_}
-               build=${tag#*-}
+               build=${tag##*-}
        else
                echo "No configuration system found. Cannot determine version."
                exit 1
        else
                echo "No configuration system found. Cannot determine version."
                exit 1
@@ -68,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 ":acdp" opt; do
+while getopts "a:cdpo" opt; do
        case $opt in
                a) ARCH=$OPTARG
                        ;;
        case $opt in
                a) ARCH=$OPTARG
                        ;;
@@ -96,6 +98,8 @@ while getopts ":acdp" 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
@@ -106,6 +110,15 @@ while getopts ":acdp" 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 ]
@@ -118,17 +131,25 @@ 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
+       
+       if [ -n "$ARCH" ]
+       then
+               arch_opt="-a $ARCH"
+       fi
+       dpkg-architecture $arch_opt > debian/setenv.sh
+       echo "" > debian/rules.pre
        
        
-       echo "paket=$paket" > debian/rules.pre
-#      shift
-       ARCH=""
+       echo "paket=$paket" >> debian/setenv.sh
+       echo "oldpack=\"$oldpack\"" >> debian/setenv.sh
        cpp_build=0
 
        set_build
        check_version
        cpp_build=0
 
        set_build
        check_version
-       echo "version=$version" >> debian/rules.pre
-       echo "build=$build" >> debian/rules.pre
+       echo "version=$version" >> debian/setenv.sh
+       echo "build=$build" >> debian/setenv.sh
 
        # get repository name
 #      tmp=$(pwd)
 
        # get repository name
 #      tmp=$(pwd)
@@ -153,18 +174,20 @@ then
        then
                echo "add_inst_tgt += debian/tmp/DEBIAN/preinst" >> rules.pre
        fi
        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
+       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
+       
+       #cat setenv.sh >> rules.pre
 
        mkdir -p tmp/DEBIAN
 
 
        mkdir -p tmp/DEBIAN
 
@@ -175,6 +198,9 @@ then
                . projects/tools/make/c_configure.sh
                . $paket.cpp.sh
        fi
                . projects/tools/make/c_configure.sh
                . $paket.cpp.sh
        fi
+       
+       # add export to setenv.sh
+       sed -i "s/^/export /" setenv.sh
 
        popd >/dev/null
        # ./. ---------------------------------------------
 
        popd >/dev/null
        # ./. ---------------------------------------------
@@ -193,10 +219,10 @@ then
                        echo "  this file is necessary for any package production."
                else    
                        echo "Source: $paket
                        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
                        grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control 
                fi
        fi
@@ -220,13 +246,20 @@ then
        if [ -f debian/$paket.cp -a -f debian/$paket.control ]
        then
                echo "PACK=binary" >> debian/rules.pre
        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
        else
                echo "PACK=version" >> debian/rules.pre
        fi
        elif [ -f debian/$paket.cp ]
        then
                echo "PACK=zip" >> debian/rules.pre
        else
                echo "PACK=version" >> debian/rules.pre
        fi
-       cp debian/rules.pre debian/setenv.sh
 fi
 
 if [ $compile -eq 1 -a ! -e debian/$paket.build ]
 fi
 
 if [ $compile -eq 1 -a ! -e debian/$paket.build ]
Unnamed repository; edit this file 'description' to name the repository.