GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve parsing of the GIT revision number.

Browse Source 
* configure.ac (git_revision): Use git rev-parse.
This commit is contained in:
Werner Koch 2012-11-16 13:50:58 +01:00
parent cd6de92f42
commit 322552a88d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -38,8 +38,8 @@ m4_define(my_isgit, [yes])
m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \ m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \
|| echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')])) || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \ m4_define([git_revision],
| awk '/^\* / {printf "%s",$3}'])) m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
m4_define([my_full_version], [my_version[]m4_if(my_isgit,[yes], m4_define([my_full_version], [my_version[]m4_if(my_isgit,[yes],
[m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])]) [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
@ -970,15 +970,15 @@ AC_OUTPUT
echo " echo "
GPGME v${VERSION} has been configured as follows: GPGME v${VERSION} has been configured as follows:
Revision: git_revision (git_brevis)
Platform: $host
GnuPG path: $GPG GnuPG path: $GPG
GnuPG version: $GPG_VERSION, min. $NEED_GPG_VERSION GnuPG version: $GPG_VERSION, min. $NEED_GPG_VERSION
GpgSM path: $GPGSM GpgSM path: $GPGSM
GpgSM version: $GPGSM_VERSION, min. $NEED_GPGSM_VERSION GpgSM version: $GPGSM_VERSION, min. $NEED_GPGSM_VERSION
GpgConf path: $GPGCONF GpgConf path: $GPGCONF
GpgConf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION GpgConf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION
G13 path: $G13 G13 path: $G13
G13 version: $G13_VERSION, min. $NEED_G13_VERSION G13 version: $G13_VERSION, min. $NEED_G13_VERSION
@ -986,6 +986,5 @@ echo "
UI Server: $uiserver UI Server: $uiserver
FD Passing: $use_descriptor_passing FD Passing: $use_descriptor_passing
GPGME Pthread: $have_pthread GPGME Pthread: $have_pthread
" "