Download as
Browse Code »

Commit bb20f59c0954546112026cdb53656ab8bdc072ce

Authored by Perry Werneck
1 parent f477367c
Exists in master and in 3 other branches develop, macos, network_module

Improving windows version info.

Showing 2 changed files with 8 additions and 5 deletions   Show diff stats
@@ -84,9 +84,12 @@ case "$host" in @@ -84,9 +84,12 @@ case "$host" in
84 DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def" 84 DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def"
85 DLLEXT=".dll" 85 DLLEXT=".dll"
86 86
87 - app_win32_revision=$(date +%y.%m.%d.%H) 87 + app_win32_revision=$(date +%-y.%-m.%-d.%-H)
88 AC_SUBST(WIN32_VERSION,$app_win32_revision) 88 AC_SUBST(WIN32_VERSION,$app_win32_revision)
89 89
  90 + app_win32_file_version=$(date +%-y,%-m,%-d,%-H)
  91 + AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version)
  92 +
90 AC_CONFIG_FILES(src/core/windows/resources.rc) 93 AC_CONFIG_FILES(src/core/windows/resources.rc)
91 94
92 app_cv_static='yes' 95 app_cv_static='yes'
@@ -165,7 +168,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) @@ -165,7 +168,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
165 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) 168 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
166 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) 169 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
167 170
168 -AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%y`.`date +%m`.`date +%d`" ]) 171 +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
169 172
170 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) 173 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
171 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2) 174 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
src/core/windows/resources.rc.in
  Diff comments   View file @bb20f59
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", "@PACKAGE_TARNAME@@DLLEXT@\0" 17 VALUE "OriginalFilename", "@PACKAGE_TARNAME@@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