Download as
Browse Code »

Commit 1063c27bef899e9d4a9a62851c05011a46a90df6

Authored by Perry Werneck
1 parent 96ac1460
Exists in master and in 1 other branch develop

Improving windows version info.

Showing 2 changed files with 8 additions and 5 deletions   Show diff stats
@@ -89,9 +89,12 @@ case "$host" in @@ -89,9 +89,12 @@ case "$host" in
89 DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def" 89 DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def"
90 DLLEXT=".dll" 90 DLLEXT=".dll"
91 91
92 - app_win32_revision=$(date +%y.%m.%d.%H) 92 + app_win32_revision=$(date +%-y.%-m.%-d.%-H)
93 AC_SUBST(WIN32_VERSION,$app_win32_revision) 93 AC_SUBST(WIN32_VERSION,$app_win32_revision)
94 94
  95 + app_win32_file_version=$(date +%-y,%-m,%-d,%-H)
  96 + AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version)
  97 +
95 AC_CONFIG_FILES(src/terminal/windows/resources.rc) 98 AC_CONFIG_FILES(src/terminal/windows/resources.rc)
96 ;; 99 ;;
97 100
@@ -149,7 +152,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) @@ -149,7 +152,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
149 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) 152 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
150 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) 153 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
151 154
152 -AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%y`.`date +%m`.`date +%d`" ]) 155 +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
153 156
154 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) 157 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
155 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2) 158 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
src/terminal/windows/resources.rc.in
  Diff comments   View file @1063c27
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