X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/160d72dfc4b7fbcd9f075fe71fd607e43c7b48c7..e5a1cf5940a548d7ade4f8e01c9a94d2a2b7b5c7:/tools/make/mconfigure diff --git a/tools/make/mconfigure b/tools/make/mconfigure index c164f10..f37f6a3 100755 --- a/tools/make/mconfigure +++ b/tools/make/mconfigure @@ -2,11 +2,29 @@ set -e function echo_usage { - echo "usage: mconfigure [options]" + echo "usage: mconfigure [options] " echo " -a " 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,21 +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" + 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 @@ -37,6 +53,7 @@ function set_build { } function check_version { + vline=$(head -1 debian/$paket.changelog) vline=${vline%-*} clversion=${vline#*(} @@ -45,6 +62,13 @@ function check_version { version=$clversion return fi + + # do no check on a modified git repos + if [ "${build: -1}" == "M" ] + then + return + fi + if [ "$clversion" != $version ] then echo "version mismatch: git: $version, changelog: $clversion" @@ -55,25 +79,16 @@ function check_version { # .cp (optional): copy step for package production # .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 -paket=$1 - configure=0 compile=0 pack=0 -shift -while getopts ":acdp" opt; do +while getopts "a:cdpo" opt; do case $opt in a) ARCH=$OPTARG ;; @@ -83,6 +98,8 @@ while getopts ":acdp" opt; do ;; p) pack=1 ;; + o) oldpack="-Zgzip" + ;; \?) echo "Invalid option: -$OPTARG" echo_usage exit 1 @@ -93,6 +110,15 @@ while getopts ":acdp" 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 ] @@ -104,15 +130,26 @@ fi if [ $configure -eq 1 ] then - echo "paket=$paket" > debian/rules.pre -# shift - ARCH="" + # delete changelog and control + 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/setenv.sh + echo "oldpack=\"$oldpack\"" >> debian/setenv.sh 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) @@ -137,18 +174,20 @@ then 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 @@ -159,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 # ./. --------------------------------------------- @@ -166,7 +208,8 @@ then # copy package control if [ -f debian/$paket.control ] then - cp debian/$paket.control debian/control + # proceed + echo else # try old fashoned way control=$(find etc -name $paket.control) || true @@ -175,12 +218,12 @@ then echo "warning: control file not found" echo " this file is necessary for any package production." else - echo "Source: $pwd - Section: main - Priority: optional - Maintainer: WagnerTech UG - " > debian/control - grep -v "Version:" $control |grep -v "Maintainer:" >> debian/control + echo "Source: $paket +Section: main +Priority: optional +Maintainer: WagnerTech UG +" > debian/$paket.control + grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control fi fi @@ -192,13 +235,25 @@ then rm -rf ../build mkdir ../build fi - debian/$paket.build -prepare + if grep -- "-prepare" debian/$paket.build >/dev/null + then + debian/rules sync + debian/$paket.build -prepare + fi fi # pack prepare - if [ -f debian/$paket.cp -a -f $paket.control ] + 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 @@ -207,7 +262,7 @@ then fi fi -if [ $compile -eq 1 -a ! -e debian/build.sh ] +if [ $compile -eq 1 -a ! -e debian/$paket.build ] then echo "no debian/build.sh: skipping build step" compile=0 @@ -215,12 +270,14 @@ fi if [ $compile -eq 1 ] then # build artefacts + . debian/setenv.sh debian/rules build fi if [ $pack -eq 1 ] then # build package + . debian/setenv.sh debian/rules pack fi