From bb20f59c0954546112026cdb53656ab8bdc072ce Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 7 Aug 2019 16:51:28 -0300 Subject: [PATCH] Improving windows version info. --- configure.ac | 7 +++++-- src/core/windows/resources.rc.in | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index d1abd9e..86e7e8e 100644 --- a/configure.ac +++ b/configure.ac @@ -84,9 +84,12 @@ case "$host" in DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def" DLLEXT=".dll" - app_win32_revision=$(date +%y.%m.%d.%H) + app_win32_revision=$(date +%-y.%-m.%-d.%-H) AC_SUBST(WIN32_VERSION,$app_win32_revision) + app_win32_file_version=$(date +%-y,%-m,%-d,%-H) + AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version) + AC_CONFIG_FILES(src/core/windows/resources.rc) app_cv_static='yes' @@ -165,7 +168,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) -AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%y`.`date +%m`.`date +%d`" ]) +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ]) app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2) diff --git a/src/core/windows/resources.rc.in b/src/core/windows/resources.rc.in index 2ca7c88..397c60e 100644 --- a/src/core/windows/resources.rc.in +++ b/src/core/windows/resources.rc.in @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0 -PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0 +FILEVERSION @WIN32_FILE_VERSION@ +PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@ BEGIN @@ -16,7 +16,7 @@ BEGIN VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" VALUE "OriginalFilename", "@PACKAGE_TARNAME@@DLLEXT@\0" VALUE "ProductName", "@PACKAGE_NAME@\0" - VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0" + VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0" END END -- libgit2 0.21.2