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

For W32 use a build number instead of abbreviated commit id.

Browse Source 
We would need to use a shortened commit id so that it fits into an 16
bit Windows variable.  Further it is a random number and not something
increasing.  Thus a build number made up from the day of the year and
the hour is much more useful to describe a build number for a specific
revision.
* configure.ac [W32]: Replace BUILD_REVISION by BUILD_NUMBER.
* src/versioninfo.rc.in: Ditto.
This commit is contained in:
Werner Koch 2012-01-19 16:04:19 +01:00
parent a0149630ce
commit 574b087e84
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -856,14 +856,19 @@ AM_CONDITIONAL(HAVE_UISERVER, test "$uiserver" != "no")
# Generate values for the DLL version info # Generate values for the DLL version info
dnl Windows uses an internal build number. We use the last day of the
dnl year concatenated with the hour for it. WARNING: You should not
dnl do a build with the same version number in another year.
if test "$have_w32_system" = yes; then if test "$have_w32_system" = yes; then
BUILD_TIMESTAMP=`date --iso-8601=minutes` BUILD_TIMESTAMP=`date --iso-8601=minutes`
BUILD_NUMBER="$(date -u '+%j%H' | sed 's/^0*\(.*\)/\1/')"
changequote(,)dnl changequote(,)dnl
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
changequote([,])dnl changequote([,])dnl
BUILD_FILEVERSION="${BUILD_FILEVERSION}${BUILD_REVISION}" BUILD_FILEVERSION="${BUILD_FILEVERSION}${BUILD_NUMBER}"
fi fi
AC_SUBST(BUILD_REVISION) AC_SUBST(BUILD_NUMBER)
AC_SUBST(BUILD_TIMESTAMP) AC_SUBST(BUILD_TIMESTAMP)
AC_SUBST(BUILD_FILEVERSION) AC_SUBST(BUILD_FILEVERSION)

8
src/versioninfo.rc.in
View File

@ -1,6 +1,6 @@
/* versioninfo.rc.in - for gpgme /* versioninfo.rc.in - for gpgme
* Copyright (C) 2005 g10 Code GmbH * Copyright (C) 2005 g10 Code GmbH
* *
* This file is free software; as a special exception the author gives * This file is free software; as a special exception the author gives
* unlimited permission to copy and/or distribute it, with or without * unlimited permission to copy and/or distribute it, with or without
* modifications, as long as this notice is preserved. * modifications, as long as this notice is preserved.
@ -9,7 +9,7 @@
* WITHOUT ANY WARRANTY, to the extent permitted by law; without even the * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/ */
/* This file is processed by configure to create versioninfo.rc */ /* This file is processed by configure to create versioninfo.rc */
#line __LINE__ "versioninfo.rc.in" #line __LINE__ "versioninfo.rc.in"
@ -18,7 +18,7 @@
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION @LIBGPGME_LT_CURRENT@,@LIBGPGME_LT_AGE@,@LIBGPGME_LT_REVISION@,@BUILD_REVISION@ FILEVERSION @LIBGPGME_LT_CURRENT@,@LIBGPGME_LT_AGE@,@LIBGPGME_LT_REVISION@,@BUILD_NUMBER@
PRODUCTVERSION @BUILD_FILEVERSION@ PRODUCTVERSION @BUILD_FILEVERSION@
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
@ -37,7 +37,7 @@ BEGIN
VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License.\0" VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License.\0"
VALUE "CompanyName", "g10 Code GmbH\0" VALUE "CompanyName", "g10 Code GmbH\0"
VALUE "FileDescription", "GPGME - GnuPG Made Easy\0" VALUE "FileDescription", "GPGME - GnuPG Made Easy\0"
VALUE "FileVersion", "@LIBGPGME_LT_CURRENT@.@LIBGPGME_LT_AGE@.@LIBGPGME_LT_REVISION@.@BUILD_REVISION@\0" VALUE "FileVersion", "@LIBGPGME_LT_CURRENT@.@LIBGPGME_LT_AGE@.@LIBGPGME_LT_REVISION@.@BUILD_NUMBER@\0"
VALUE "InternalName", "gpgme\0" VALUE "InternalName", "gpgme\0"
VALUE "LegalCopyright", "Copyright © 2005 g10 Code GmbH\0" VALUE "LegalCopyright", "Copyright © 2005 g10 Code GmbH\0"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", "\0"