phpide

[projects.git] / tools / make / mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 3bca62a7aaf030a4a571c31df1353c031fa907e6..8ce366eca347332396bd07fab8ab2e269ef37173 100755 (executable)
--- 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
@@ -20,23 +21,24 @@ function set_build {
                        tag="0.0-TOP"
                fi
                changes=$(git status -s |grep "^ *M") || true
-               if test -z "$changes"
+               if test -n "$changes"
                then
                        tag="${tag}M"
                fi
-               version=${tag%-*}
+               version=${tag%%-*}
                build=${tag#*-}
        fi
 }
 
 function check_version {
+       vline=$(head -1 debian/$paket.changelog)
+       vline=${vline%-*}
+       clversion=${vline#*(}
        if [ $version = "0.0" ]
        then
+               version=$clversion
                return
        fi
-       vline=$(head -1 debian/$paket.changelog)
-       vline=${vline%-*}
-       clversion=${vline#*(}
        if [ "$clversion" != $version ]
        then
                echo "version mismatch: git: $version, changelog: $clversion"
@@ -59,6 +61,7 @@ then
        exit 2
 fi
 
+paket=$1
 echo "export paket=$1" > debian/setenv.sh
 shift
 ARCH=""
@@ -72,6 +75,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 +126,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 <mail@wagnertech.de>
+" > 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)