From 43157c8e487f10d7d30b1435c8f87b294d3d9006 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 7 Aug 2019 17:17:31 -0300 Subject: [PATCH] Improving windows version information. --- client/src/core/windows/resources.rc.in | 6 +++--- configure.ac | 8 ++++++-- server/src/plugin/windows/resources.rc.in | 6 +++--- server/src/service/windows/resources.rc.in | 6 +++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/client/src/core/windows/resources.rc.in b/client/src/core/windows/resources.rc.in index eea66da..a89b2a1 100644 --- a/client/src/core/windows/resources.rc.in +++ b/client/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) 2019 Banco do Brasil S/A. All Rights Reserved\0" VALUE "OriginalFilename", "ipc3270@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 diff --git a/configure.ac b/configure.ac index 9106dc2..adc6c27 100644 --- a/configure.ac +++ b/configure.ac @@ -85,8 +85,12 @@ case "$host" in DLLEXT=".dll" DLLPREFIX="" - 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(server/src/plugin/windows/resources.rc) AC_CONFIG_FILES(server/src/service/windows/resources.rc) AC_CONFIG_FILES(client/src/core/windows/resources.rc) @@ -143,7 +147,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/server/src/plugin/windows/resources.rc.in b/server/src/plugin/windows/resources.rc.in index e3675ae..1a77805 100644 --- a/server/src/plugin/windows/resources.rc.in +++ b/server/src/plugin/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", "ipc3270@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 diff --git a/server/src/service/windows/resources.rc.in b/server/src/service/windows/resources.rc.in index 2c53e1c..bbe2210 100644 --- a/server/src/service/windows/resources.rc.in +++ b/server/src/service/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", "ipc3270@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