diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/versioninfo.rc.in | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 5414963c..ebe30e92 100644 --- a/configure.ac +++ b/configure.ac @@ -856,14 +856,19 @@ AM_CONDITIONAL(HAVE_UISERVER, test "$uiserver" != "no") # 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 BUILD_TIMESTAMP=`date --iso-8601=minutes` + BUILD_NUMBER="$(date -u '+%j%H' | sed 's/^0*\(.*\)/\1/')" 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}${BUILD_NUMBER}" fi -AC_SUBST(BUILD_REVISION) +AC_SUBST(BUILD_NUMBER) AC_SUBST(BUILD_TIMESTAMP) AC_SUBST(BUILD_FILEVERSION) diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in index bfb652e1..9c1b4f50 100644 --- a/src/versioninfo.rc.in +++ b/src/versioninfo.rc.in @@ -1,6 +1,6 @@ /* versioninfo.rc.in - for gpgme * Copyright (C) 2005 g10 Code GmbH - * + * * This file is free software; as a special exception the author gives * unlimited permission to copy and/or distribute it, with or without * modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ - + /* This file is processed by configure to create versioninfo.rc */ #line __LINE__ "versioninfo.rc.in" @@ -18,7 +18,7 @@ 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@ FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -37,7 +37,7 @@ BEGIN VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License.\0" VALUE "CompanyName", "g10 Code GmbH\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 "LegalCopyright", "Copyright � 2005 g10 Code GmbH\0" VALUE "LegalTrademarks", "\0" |