[Commits] [SCM] claws branch, master, updated. 3.9.0-156-gf9f7934

[mones at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  f9f7934654d7758d1a315e7af9e62740a2bd627d (commit)
       via  79c5de0172174aa0248edd1e399fc25f6668fd1e (commit)
       via  30b8848a9f01cc2b75704df044d15177acdfb329 (commit)
      from  77d3fd1f3acf104f07646ad81ecf3af49fff403c (commit)


- Log -----------------------------------------------------------------
commit f9f7934654d7758d1a315e7af9e62740a2bd627d
Author: Ricardo Mones <ricardo at mones.org>
Date:   Thu Mar 21 01:32:39 2013 +0100

    Fix build of 'make dist' generated tarballs
    
    The version is set in stone before the 'make dist' run.
    In the cases where no .git directory is found, like generated
    tarballs, the stone is summoned instead.

diff --git a/.gitignore b/.gitignore
index c5fd1e3..ced542e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -489,3 +489,4 @@
 /TAGS
 /tools/Makefile
 /tools/Makefile.in
+/version
diff --git a/Makefile.am b/Makefile.am
index 05788ec..fa09d87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,9 @@ EXTRA_DIST = \
 	claws-mail.desktop \
 	claws-mail.png \
 	autogen.sh \
-	claws-features.h.in
+	claws-features.h.in \
+	version.in \
+	version
 
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
diff --git a/configure.ac b/configure.ac
index 94b0ab2..e129d9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,11 @@ BINARY_AGE=0
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
-GIT_VERSION=`git describe --abbrev=6 --dirty --always`
+if test \( -d .git \); then
+    GIT_VERSION=`git describe --abbrev=6 --dirty --always`
+else
+    GIT_VERSION=`sh -c '. ./version'`
+fi
 MAJOR_VERSION=`echo $GIT_VERSION | awk -F. '{print $1}'`
 MINOR_VERSION=`echo $GIT_VERSION | awk -F. '{print $2}'`
 MICRO_VERSION=`echo $GIT_VERSION | awk -F- '{print $1}' | awk -F. '{print $3}'`
@@ -1892,6 +1896,7 @@ manual/de/dist/ps/Makefile
 manual/de/dist/html/Makefile
 manual/de/dist/txt/Makefile
 claws-mail.pc
+version
 ])
 
 dnl Output the configuration summary
diff --git a/version.in b/version.in
new file mode 100644
index 0000000..141efac
--- /dev/null
+++ b/version.in
@@ -0,0 +1 @@
+echo "@GIT_VERSION@"

commit 79c5de0172174aa0248edd1e399fc25f6668fd1e
Author: Ricardo Mones <ricardo at mones.org>
Date:   Wed Mar 20 22:32:25 2013 +0100

    Use awk instead of cut
    
    Create less processes to obtain these numbers and fix
    the value set to EXTRA_VERSION on releases.

diff --git a/configure.ac b/configure.ac
index 2a41ae1..94b0ab2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,10 +13,10 @@ EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 GIT_VERSION=`git describe --abbrev=6 --dirty --always`
-MAJOR_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f1 -d.`
-MINOR_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f2 -d.`
-MICRO_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f3 -d.`
-EXTRA_VERSION=`echo $GIT_VERSION | cut -f2 -d-`
+MAJOR_VERSION=`echo $GIT_VERSION | awk -F. '{print $1}'`
+MINOR_VERSION=`echo $GIT_VERSION | awk -F. '{print $2}'`
+MICRO_VERSION=`echo $GIT_VERSION | awk -F- '{print $1}' | awk -F. '{print $3}'`
+EXTRA_VERSION=`echo $GIT_VERSION | awk -F- '{print $2}'`
 
 if test \( "x$EXTRA_VERSION" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}git${EXTRA_VERSION}

commit 30b8848a9f01cc2b75704df044d15177acdfb329
Author: Ricardo Mones <ricardo at mones.org>
Date:   Wed Mar 20 22:30:35 2013 +0100

    Remove references to nonexistent variables

diff --git a/configure.ac b/configure.ac
index 4c4b18d..2a41ae1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,14 +25,6 @@ else
     EXTRA_VERSION=0
 fi
 
-if test \( "x$HASH_VERSION" != "x" \); then
-    if test \( "x$DIRTY_VERSION" != "x" \); then
-        VERSION=${VERSION}+${HASH_VERSION}+local
-    else
-        VERSION=${VERSION}+${HASH_VERSION}
-    fi
-fi
-
 if test \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 fi
@@ -51,7 +43,6 @@ AC_SUBST(MINOR_VERSION)
 AC_SUBST(MICRO_VERSION)
 AC_SUBST(EXTRA_VERSION)
 AC_SUBST(GIT_VERSION)
-AC_SUBST(HASH_VERSION)
 
 AC_CHECK_PROG(HAVE_GTK_ICON_CACHE, gtk-update-icon-cache, yes, no)
 AM_CONDITIONAL(UPDATE_GTK_ICON_CACHE, test x"$HAVE_GTK_ICON_CACHE" = xyes)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore   |    1 +
 Makefile.am  |    4 +++-
 configure.ac |   24 ++++++++++--------------
 version.in   |    1 +
 4 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 version.in


hooks/post-receive
-- 
Claws Mail