1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-25 21:37:58 +02:00

Update to modern beta release numbering scheme.

* configure.ac: s/my_/mym4_/.  Add new release building code.
This commit is contained in:
Werner Koch 2013-07-25 09:21:46 +02:00
parent 801803ab6e
commit 439999da11

View File

@ -22,24 +22,30 @@
AC_PREREQ(2.59) AC_PREREQ(2.59)
min_automake_version="1.9.3" min_automake_version="1.9.3"
# Remember to change the version number immediately *after* a release. # To build a release you need to create a tag with the version number
# Set my_issvn to "yes" for non-released code. Remember to run an # (git tag -s gnupg-1.n.m) and run "./autogen.sh --force". Please
# "svn up" and "autogen.sh --force" right before creating a distribution. # bump the version number immediately *after* the release and do
m4_define([my_version], [1.4.14]) # another commit and push so that the git magic is able to work.
m4_define([my_issvn], [yes]) m4_define([mym4_version], [1.4.14])
m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \ # Below is m4 magic to extract and compute the git revision number,
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)])) # the decimalized short revision number, a beta version string and a
m4_define([git_revision], # flag indicating a development version (mym4_isgit). Note that the
# m4 processing is done by autoconf and not during the configure run.
m4_define([mym4_revision],
m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes], m4_define([mym4_revision_dec],
[m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])]) m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
m4_define([mym4_betastring],
m4_esyscmd_s([git describe --match 'gnupg-1.[0-9].*[0-9]' --long|\
awk -F- '$3!=0{print"-beta"$3}']))
m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
AC_INIT([gnupg],[my_full_version],[http://bugs.gnupg.org]) AC_INIT([gnupg],[mym4_full_version], [http://bugs.gnupg.org])
# Set development_version to yes if the minor number is odd or you
# feel that the default check for a development version is not
# sufficient. development_version=mym4_isgit
development_version=no
AC_CONFIG_AUX_DIR(scripts) AC_CONFIG_AUX_DIR(scripts)
AC_CONFIG_SRCDIR(g10/gpg.c) AC_CONFIG_SRCDIR(g10/gpg.c)