2 commits - autogen.sh

[Jeroen van Meeuwen]

 autogen.sh |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 0893d1cfd36a3283b960861234eaf110975dfeb3
Merge: f307fa0 8c09cd2
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Oct 1 10:48:20 2012 +0100

    Merge branch 'master' of ssh://git.kolabsys.com/git/libkolab



commit f307fa060929335312827b55fa2edd524167cc1b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Oct 1 10:47:54 2012 +0100

    Fix autogen.sh to use the major, minor and teeny (if set) from CMakeLists.txt

diff --git a/autogen.sh b/autogen.sh
index 7ff2efc..c5cce51 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -39,6 +39,16 @@ if [ ${dobuild} -eq 0 -a ${doprep} -eq 0 -a ${dotest} -eq 0 -a ${doinstall} -eq
     doinstall=1
 fi
 
+version_major=`grep -E "^set\s*\(Libkolab_VERSION_MAJOR [0-9]+\)" CMakeLists.txt | sed -r -e 's/^set\s*\(Libkolab_VERSION_MAJOR ([0-9]+)\)/\1/g'`
+version_minor=`grep -E "^set\s*\(Libkolab_VERSION_MINOR [0-9]+\)" CMakeLists.txt | sed -r -e 's/^set\s*\(Libkolab_VERSION_MINOR ([0-9]+)\)/\1/g'`
+version_patch=`grep -E "^set\s*\(Libkolab_VERSION_PATCH [0-9]+\)" CMakeLists.txt | sed -r -e 's/^set\s*\(Libkolab_VERSION_PATCH ([0-9]+)\)/\1/g'`
+
+if [ -z "${version_patch}" ]; then
+    version="${version_major}.${version_minor}"
+else
+    version="${version_major}.${version_minor}.${version_patch}"
+fi
+
 # Rebuilds the entire foo in one go. One shot, one kill.
 rm -rf build/
 mkdir -p build
@@ -62,6 +72,7 @@ fi
 if [ ${dotest} -eq 1 ]; then
     # Execute some tests?
     pushd tests
+    unset DISPLAY
     ./benchmarktest
     ./calendaringtest
     ./formattest
@@ -78,7 +89,10 @@ fi
 
 cd ..
 
-git archive --prefix=libkolab-0.3.1/ HEAD | gzip -c > libkolab-0.3.1.tar.gz
+rm -rf libkolab-${version}.tar.gz
+git archive --prefix=libkolab-${version}/ HEAD | gzip -c > libkolab-${version}.tar.gz
+
+rm -rf `rpm --eval='%{_sourcedir}'`/libkolab-${version}.tar.gz
+cp libkolab-${version}.tar.gz `rpm --eval='%{_sourcedir}'`
 
-cp libkolab-0.3.1.tar.gz `rpm --eval='%{_sourcedir}'`