Download as
Browse Code »

Commit 913d1cdaf92ac8702408e256472396e09478ae6b

Authored by Perry Werneck
1 parent 8c97ec84
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Improving windows version info.

Showing 2 changed files with 8 additions and 5 deletions   Show diff stats
@@ -100,9 +100,12 @@ case "$host" in @@ -100,9 +100,12 @@ case "$host" in
100 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" 100 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
101 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" 101 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
102 102
103 - app_win32_revision=$(date +%y.%m.%d.%H) 103 + app_win32_revision=$(date +%-y.%-m.%-d.%-H)
104 AC_SUBST(WIN32_VERSION,$app_win32_revision) 104 AC_SUBST(WIN32_VERSION,$app_win32_revision)
105 105
  106 + app_win32_file_version=$(date +%-y,%-m,%-d,%-H)
  107 + AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version)
  108 +
106 dnl https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw 109 dnl https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw
107 STATIC_LDFLAGS="-static-libstdc++ -static-libgcc -static" 110 STATIC_LDFLAGS="-static-libstdc++ -static-libgcc -static"
108 DLL_LDFLAGS="-shared -Wl,--add-stdcall-alias" 111 DLL_LDFLAGS="-shared -Wl,--add-stdcall-alias"
@@ -190,7 +193,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) @@ -190,7 +193,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
190 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) 193 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
191 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) 194 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
192 195
193 -AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%y`.`date +%m`.`date +%d`" ]) 196 +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
194 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.]) ]) 197 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.]) ])
195 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.]) ]) 198 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.]) ])
196 199
src/pw3270/windows/resources.rc.in
  Diff comments   View file @913d1cd
@@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
3 1 ICON @PACKAGE_TARNAME@.ico 3 1 ICON @PACKAGE_TARNAME@.ico
4 4
5 VS_VERSION_INFO VERSIONINFO 5 VS_VERSION_INFO VERSIONINFO
6 -FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0  
7 -PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0 6 +FILEVERSION @WIN32_FILE_VERSION@
  7 +PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@
8 8
9 BEGIN 9 BEGIN
10 10
@@ -18,7 +18,7 @@ BEGIN @@ -18,7 +18,7 @@ BEGIN
18 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" 18 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0"
19 VALUE "OriginalFilename", "@PACKAGE_TARNAME@.exe\0" 19 VALUE "OriginalFilename", "@PACKAGE_TARNAME@.exe\0"
20 VALUE "ProductName", "@PACKAGE_NAME@\0" 20 VALUE "ProductName", "@PACKAGE_NAME@\0"
21 - VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0"" 21 + VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0""
22 END 22 END
23 END 23 END
24 24