[git] KSBA - branch, master, updated. libksba-1.2.0-8-g3776ae8
by Werner Koch
cvs at cvs.gnupg.org
Wed Sep 26 18:42:07 CEST 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 "KSBA is a library to access X.509 certificates and CMS data.".
The branch, master has been updated
via 3776ae8f4ea642ad6ac0af726e90492e6f82eb5f (commit)
via 120d58757d43d10278d4f5ec4126bc18d2ccd28a (commit)
from d4333eefc945750613ac9483a41793b5971e3cfe (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 3776ae8f4ea642ad6ac0af726e90492e6f82eb5f
Author: Werner Koch <wk at gnupg.org>
Date: Wed Sep 26 17:17:21 2012 +0200
Allow building with w64-mingw32
* autogen.sh <--build-w32>: Support the w64-mingw32 toolchain. Also
prepare for 64 bit building.
diff --git a/autogen.sh b/autogen.sh
index 86d0f95..17c3380 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -64,6 +64,10 @@ case "$1" in
myhost="w32"
myhostsub="ce"
;;
+ --build-w64)
+ myhost="w32"
+ myhostsub="64"
+ ;;
--build*)
echo "**Error**: invalid build option $1" >&2
exit 1
@@ -91,9 +95,14 @@ if [ "$myhost" = "w32" ]; then
[ -z "$w32root" ] && w32root="$HOME/w32ce_root"
toolprefixes="arm-mingw32ce"
;;
+ 64)
+ w32root="$w64root"
+ [ -z "$w32root" ] && w32root="$HOME/w64root"
+ toolprefixes="amd64-mingw32msvc"
+ ;;
*)
[ -z "$w32root" ] && w32root="$HOME/w32root"
- toolprefixes="i586-mingw32msvc i386-mingw32msvc"
+ toolprefixes="i586-mingw32msvc i386-mingw32msvc i686-w64-mingw32"
;;
esac
echo "Using $w32root as standard install directory" >&2
commit 120d58757d43d10278d4f5ec4126bc18d2ccd28a
Author: Werner Koch <wk at gnupg.org>
Date: Wed Sep 26 17:09:33 2012 +0200
Switch to the new automagic beta numbering scheme.
* configure.ac: Add all the required m4 magic.
diff --git a/configure.ac b/configure.ac
index 1a932b5..9f6fef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,20 +22,28 @@ AC_PREREQ(2.61)
min_automake_version="1.10"
-# Remember to change the version number immediately *after* a release.
-# Set my_issvn to "yes" for non-released code. Remember to run an
-# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.3.0])
-m4_define([my_issvn], [yes])
-
-m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
- | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
-m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
+# To build a release you need to create a tag with the version number
+# (git tag -s libksba-n.m.k) and run "./autogen.sh --force". Please
+# bump the version number immediately after the release and do another
+# commit and push so that the git magic is able to work. See below
+# for the LT versions.
+m4_define(mym4_version, [1.3.0])
+
+# Below is m4 magic to extract and compute the revision number, the
+# decimalized short revision number, a beta version string, and a 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 branch -v 2>/dev/null \
| awk '/^\* / {printf "%s",$3}']))
-m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
- [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
+m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+m4_define([mym4_betastring],
+ m4_esyscmd_s([git describe --match 'libksba-[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([libksba],[my_full_version],[http://bugs.gnupg.org])
+AC_INIT([libksba],[mym4_full_version],[http://bugs.gnupg.org])
# LT Version numbers: Remember to change them just *before* a release.
# (Interfaces removed: CURRENT++, AGE=0, REVISION=0)
@@ -53,8 +61,6 @@ KSBA_CONFIG_API_VERSION=1
NEED_GPG_ERROR_VERSION=1.8
-m4_define([git_brevis],m4_esyscmd(printf "%u" 0x[]m4_substr(git_revision,0,4)))
-BUILD_REVISION=m4_if(git_revision,[],[svn_revision],[git_brevis])
PACKAGE=$PACKAGE_NAME
VERSION=$PACKAGE_VERSION
@@ -376,13 +382,15 @@ if test "$have_w32_system" = yes; then
changequote(,)dnl
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
changequote([,])dnl
- BUILD_FILEVERSION="${BUILD_FILEVERSION}${BUILD_REVISION}"
+ BUILD_FILEVERSION="${BUILD_FILEVERSION}mym4_revision_dec"
fi
AC_SUBST(BUILD_REVISION)
AC_SUBST(BUILD_TIMESTAMP)
AC_SUBST(BUILD_FILEVERSION)
+BUILD_REVISION="mym4_revision"
+AC_SUBST(BUILD_REVISION)
AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
- [Subversion revision used to build this package])
+ [GIT commit id revision used to build this package])
AC_CONFIG_FILES([
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index 182e195..9828456 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -18,7 +18,7 @@
VS_VERSION_INFO VERSIONINFO
- FILEVERSION @LIBKSBA_LT_CURRENT@, at LIBKSBA_LT_AGE@, at LIBKSBA_LT_REVISION@, at BUILD_REVISION@
+ FILEVERSION @BUILD_FILEVERSION@
PRODUCTVERSION @BUILD_FILEVERSION@
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
-----------------------------------------------------------------------
Summary of changes:
autogen.sh | 11 ++++++++++-
configure.ac | 40 ++++++++++++++++++++++++----------------
src/versioninfo.rc.in | 2 +-
3 files changed, 35 insertions(+), 18 deletions(-)
hooks/post-receive
--
KSBA is a library to access X.509 certificates and CMS data.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list