X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/e8baabd499d9d4ef551f89102424930c3185a4b3..b51de7bb9a8b067840d509bedfdb55174bd4c00e:/tools/make/mconfigure diff --git a/tools/make/mconfigure b/tools/make/mconfigure index 7b6db95..09b6d3d 100755 --- a/tools/make/mconfigure +++ b/tools/make/mconfigure @@ -9,27 +9,47 @@ function echo_usage { echo " -p : pack default: do all" } +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 { if [ -e .svn ] then version="0.0" build=$(svnversion) build=${build/:/-} + 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 - changes=$(git status -s |grep "^ *M") || true - if test -n "$changes" + tag_paket=${tag%_*} + if [ "$tag_paket" != "$paket" ] then - tag="${tag}M" + tag="0.0-0TOP" 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 +57,7 @@ function set_build { } function check_version { + vline=$(head -1 debian/$paket.changelog) vline=${vline%-*} clversion=${vline#*(} @@ -45,6 +66,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" @@ -73,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 ;; @@ -104,15 +132,26 @@ fi if [ $configure -eq 1 ] then - echo "paket=$paket" > debian/rules.pre -# shift - ARCH="" + # delete changelog and control + rm debian/changelog debian/control || 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 + 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 +176,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,45 +200,71 @@ 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 # ./. --------------------------------------------- # copy package control - if [ ! -f debian/control ] + if [ -f debian/$paket.control ] then + # proceed + echo + else + # try old fashoned way control=$(find etc -name $paket.control) || true if [ -z "$control" ] 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 + + # build prepare + if [ -e debian/$paket.build ] + then + if [ -e ../build ] + then + rm -rf ../build + mkdir ../build fi + 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 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 fi -# check for copy file -#if [ ! -f debian/$paket.cp ] -#then -# # search for copy file -# copy=$(find . -name $paket.cp) -# if [ -n "$copy" ] -# then -# echo "ln -sf ../$copy debian/" -# ln -sf ../$copy debian/ -# else -# echo "warning: file $paket.cp missing or not executable:" -# echo " this file is necessary for any package production." -# fi -#fi - -if [ ! -e debian/build.sh ] +if [ $compile -eq 1 -a ! -e debian/$paket.build ] then echo "no debian/build.sh: skipping build step" compile=0 @@ -205,12 +272,14 @@ fi if [ $compile -eq 1 ] then # build artefacts + . debian/setenv.sh debian/rules build fi if [ $pack -eq 1 ] then # build package - debian/rules binary + . debian/setenv.sh + debian/rules pack fi