Download as
Browse Code »

Commit 43157c8e487f10d7d30b1435c8f87b294d3d9006

Authored by Perry Werneck
1 parent 2766d0c1
Exists in master and in 1 other branch develop

Improving windows version information.

Showing 4 changed files with 15 additions and 11 deletions   Show diff stats
client/src/core/windows/resources.rc.in
  Diff comments   View file @43157c8
1 #include <windows.h> 1 #include <windows.h>
2 2
3 VS_VERSION_INFO VERSIONINFO 3 VS_VERSION_INFO VERSIONINFO
4 -FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0  
5 -PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0 4 +FILEVERSION @WIN32_FILE_VERSION@
  5 +PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@
6 6
7 BEGIN 7 BEGIN
8 8
@@ -16,7 +16,7 @@ BEGIN @@ -16,7 +16,7 @@ BEGIN
16 VALUE "LegalCopyright", "(C) 2019 Banco do Brasil S/A. All Rights Reserved\0" 16 VALUE "LegalCopyright", "(C) 2019 Banco do Brasil S/A. All Rights Reserved\0"
17 VALUE "OriginalFilename", "ipc3270@DLLEXT@\0" 17 VALUE "OriginalFilename", "ipc3270@DLLEXT@\0"
18 VALUE "ProductName", "@PACKAGE_NAME@\0" 18 VALUE "ProductName", "@PACKAGE_NAME@\0"
19 - VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0"" 19 + VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0""
20 END 20 END
21 END 21 END
22 22
@@ -85,8 +85,12 @@ case &quot;$host&quot; in @@ -85,8 +85,12 @@ case &quot;$host&quot; in
85 DLLEXT=".dll" 85 DLLEXT=".dll"
86 DLLPREFIX="" 86 DLLPREFIX=""
87 87
88 - app_win32_revision=$(date +%y.%m.%d.%H) 88 + app_win32_revision=$(date +%-y.%-m.%-d.%-H)
89 AC_SUBST(WIN32_VERSION,$app_win32_revision) 89 AC_SUBST(WIN32_VERSION,$app_win32_revision)
  90 +
  91 + app_win32_file_version=$(date +%-y,%-m,%-d,%-H)
  92 + AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version)
  93 +
90 AC_CONFIG_FILES(server/src/plugin/windows/resources.rc) 94 AC_CONFIG_FILES(server/src/plugin/windows/resources.rc)
91 AC_CONFIG_FILES(server/src/service/windows/resources.rc) 95 AC_CONFIG_FILES(server/src/service/windows/resources.rc)
92 AC_CONFIG_FILES(client/src/core/windows/resources.rc) 96 AC_CONFIG_FILES(client/src/core/windows/resources.rc)
@@ -143,7 +147,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) @@ -143,7 +147,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
143 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) 147 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
144 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) 148 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
145 149
146 -AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%y`.`date +%m`.`date +%d`" ]) 150 +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
147 151
148 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) 152 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
149 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2) 153 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
server/src/plugin/windows/resources.rc.in
  Diff comments   View file @43157c8
1 #include <windows.h> 1 #include <windows.h>
2 2
3 VS_VERSION_INFO VERSIONINFO 3 VS_VERSION_INFO VERSIONINFO
4 -FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0  
5 -PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0 4 +FILEVERSION @WIN32_FILE_VERSION@
  5 +PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@
6 6
7 BEGIN 7 BEGIN
8 8
@@ -16,7 +16,7 @@ BEGIN @@ -16,7 +16,7 @@ BEGIN
16 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" 16 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0"
17 VALUE "OriginalFilename", "ipc3270@DLLEXT@\0" 17 VALUE "OriginalFilename", "ipc3270@DLLEXT@\0"
18 VALUE "ProductName", "@PACKAGE_NAME@\0" 18 VALUE "ProductName", "@PACKAGE_NAME@\0"
19 - VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0"" 19 + VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0""
20 END 20 END
21 END 21 END
22 22
server/src/service/windows/resources.rc.in
  Diff comments   View file @43157c8
1 #include <windows.h> 1 #include <windows.h>
2 2
3 VS_VERSION_INFO VERSIONINFO 3 VS_VERSION_INFO VERSIONINFO
4 -FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0  
5 -PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,0 4 +FILEVERSION @WIN32_FILE_VERSION@
  5 +PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@
6 6
7 BEGIN 7 BEGIN
8 8
@@ -16,7 +16,7 @@ BEGIN @@ -16,7 +16,7 @@ BEGIN
16 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" 16 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0"
17 VALUE "OriginalFilename", "ipc3270@DLLEXT@\0" 17 VALUE "OriginalFilename", "ipc3270@DLLEXT@\0"
18 VALUE "ProductName", "@PACKAGE_NAME@\0" 18 VALUE "ProductName", "@PACKAGE_NAME@\0"
19 - VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0\0"" 19 + VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0""
20 END 20 END
21 END 21 END
22 22