From 152748262107973df2ea6d018324a75289a5d367 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Wed, 18 Apr 2018 18:17:03 +0200 Subject: [PATCH] phpide --- debian/mbuild.cp | 1 + tools/make/mconfigure | 53 ++++++++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/debian/mbuild.cp b/debian/mbuild.cp index ca1ddaf..0a78def 100755 --- a/debian/mbuild.cp +++ b/debian/mbuild.cp @@ -5,6 +5,7 @@ base=$1 mkdir -p $base/usr/bin/ cp tools/make/mconfigure $base/usr/bin/ +cp tools/make/treecopy $base/usr/bin/ mkdir -p $base/usr/share/mbuild/ cp tools/make/rules $base/usr/share/mbuild/ diff --git a/tools/make/mconfigure b/tools/make/mconfigure index ecb35a3..be5f3ba 100755 --- a/tools/make/mconfigure +++ b/tools/make/mconfigure @@ -12,6 +12,7 @@ function set_build { then version="0.0" build=$(svnversion) + build=${build/:/-} elif [ -e .git ] then tag=$(git describe --tags 2>/dev/null) || true @@ -72,6 +73,7 @@ echo "export build=$build" >> debian/setenv.sh # get repository name tmp=$(pwd) pwd=${tmp##*/} +pwd=${pwd,,*} echo "export pwd=$pwd" >> debian/setenv.sh echo "building $paket with build $version-$build" @@ -122,45 +124,50 @@ then . $paket.cpp.sh fi -# copy package control -#control=$(find .. -name $paket.control) -#build_number=${build#*_} -#if [ -z "$control" ] -#then -# echo "warning: control file not found" -# echo " this file is necessary for any package production." -#else -# sed "s/%BUILD%/$build_number/" $control |sed "s/%ARCH%/$ARCH/" >$paket.control -# echo "$paket.control written." -# -# # extract version -# version=$(grep Version $paket.control |sed "s/Version: //") -#fi - popd >/dev/null +# copy package control +if [ ! -f debian/control ] +then + control=$(find etc -name $paket.control) + 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 + fi +fi + if [ $prepare = 1 ] then exit 0 fi -# build package -. debian/setenv.sh -debian/rules binary - -## check for copy file -#if [ ! -f $paket.cp ] +# check for copy file +#if [ ! -f debian/$paket.cp ] #then # # search for copy file -# copy=$(find .. -name $paket.cp) +# copy=$(find . -name $paket.cp) # if [ -n "$copy" ] # then -# ln -sf $copy . +# 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 + +# build package +. debian/setenv.sh +debian/rules binary + # ## check for installation scripts #files=$(find .. -name $paket.preinst) -- 2.20.1