[git] Assuan - branch, master, updated. libassuan-2.0.3-11-g76ceeb3
by Werner Koch
cvs at cvs.gnupg.org
Fri Nov 16 15:00:53 CET 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".
The branch, master has been updated
via 76ceeb3582bba138227bf76167b451ee017d38fc (commit)
via e6688eebc03fda7c8c81789c24ad13c06f648a9f (commit)
from ca3f8e4b5bbe5549bd7804cf3bff36be21db1b82 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 76ceeb3582bba138227bf76167b451ee017d38fc
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 16 13:27:48 2012 +0100
Improve parsing of the GIT revision number.
* configure.ac (mmm4_revision): Use git rev-parse. Print version
information at the end of a configure run.
diff --git a/configure.ac b/configure.ac
index c908ef2..b420f48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,8 +30,9 @@ m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \
|| echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
-m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
- | awk '/^\* / {printf "%s",$3}']))
+m4_define([git_revision],
+ m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
+
m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
[m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
@@ -382,3 +383,10 @@ AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
AC_CONFIG_FILES([src/versioninfo.rc])
AC_OUTPUT
+
+echo "
+ Libassuan v${VERSION} has been configured as follows:
+
+ Revision: git_revision
+ Platform: $host
+"
commit e6688eebc03fda7c8c81789c24ad13c06f648a9f
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 16 13:26:39 2012 +0100
Fix non-portable use of chmod in autogen.sh.
* autogen.sh: Remove option -c from chmod.
diff --git a/autogen.sh b/autogen.sh
index 42e00d5..875edde 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -259,14 +259,14 @@ if [ -d .git ]; then
and .git/hooks/pre-commit.sample out of the way.
EOF
cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
- chmod -c +x .git/hooks/pre-commit
+ chmod +x .git/hooks/pre-commit
fi
if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
cat <<EOF >&2
*** Activating commit log message check hook. ***
EOF
cp -av build-aux/git-hooks/commit-msg .git/hooks/commit-msg
- chmod -c +x .git/hooks/commit-msg
+ chmod +x .git/hooks/commit-msg
fi
fi
-----------------------------------------------------------------------
Summary of changes:
autogen.sh | 4 ++--
configure.ac | 12 ++++++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org
More information about the Gnupg-commits
mailing list