From 913d1cdaf92ac8702408e256472396e09478ae6b Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 7 Aug 2019 16:59:16 -0300 Subject: [PATCH] Improving windows version info. --- configure.ac | 7 +++++-- src/pw3270/windows/resources.rc.in | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 142b191..5eb40e2 100644 --- a/configure.ac +++ b/configure.ac @@ -100,9 +100,12 @@ case "$host" in CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" - 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) + dnl https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw STATIC_LDFLAGS="-static-libstdc++ -static-libgcc -static" DLL_LDFLAGS="-shared -Wl,--add-stdcall-alias" @@ -190,7 +193,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`" ]) AC_ARG_WITH([session-name], [AS_HELP_STRING([--with-session-name], [Set default session name])], [ AC_DEFINE_UNQUOTED(DEFAULT_SESSION_NAME, $withval) ],[ AC_MSG_NOTICE([No default session name.]) ]) AC_ARG_WITH([application-name], [AS_HELP_STRING([--with-application-name], [Set application name])], [ AC_DEFINE_UNQUOTED(APPLICATION_NAME, $withval) ],[ AC_MSG_NOTICE([No default application name.]) ]) diff --git a/src/pw3270/windows/resources.rc.in b/src/pw3270/windows/resources.rc.in index a3e5439..12adfbf 100644 --- a/src/pw3270/windows/resources.rc.in +++ b/src/pw3270/windows/resources.rc.in @@ -3,8 +3,8 @@ 1 ICON @PACKAGE_TARNAME@.ico 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 @@ -18,7 +18,7 @@ BEGIN VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" VALUE "OriginalFilename", "@PACKAGE_TARNAME@.exe\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