summaryrefslogtreecommitdiff
path: root/desktop/win32
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2011-12-10 16:47:02 +0100
committerAndras Timar <atimar@suse.com>2011-12-10 22:25:28 +0100
commit3fbedc3e8f65c91999dcee42daa8312e387dcf40 (patch)
tree77e876cf4bfbe75c9b0126f8590287e1909c5a1b /desktop/win32
parent8d0816f1cfc3929f261baa0840b9d16ed1b86576 (diff)
enhance VersionInfo resource of Windows excutables
+ added ProductName (a required parameter), It is LibreOffice + CompanyName is configurable, it is $(OOO_VENDOR), that is set --with-vendor configure switch. If not set, then CompanyName is empty string which is fine, too. + Binary file version and FileVersion string show the same value, and version number is sane: main version + subversion + microversion + build number, such as 3.5.0.0 + LegalCopyright text is the same as in the About box, year range can be set in minor.mk - removed archaic and overcomplicated version number calculating macros - removed version.lst, copied relevant content to minor.mk - removed binary RCDATA resources, I don't think they were of any use
Diffstat (limited to 'desktop/win32')
-rw-r--r--desktop/win32/source/applauncher/launcher.rc7
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index e8715348a680..b7c84b13780f 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -35,8 +35,8 @@
// -----------------------------------------------------------------------
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
- PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+ FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
FILEFLAGSMASK 0x3F
FILEFLAGS
#if defined(DEBUG)
@@ -54,10 +54,11 @@ VS_VERSION_INFO VERSIONINFO
BLOCK "040904E4"
{
// International StringTable
- VALUE "CompanyName", "The Document Foundation\0"
+ VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
VALUE "FileVersion", PPS(VER_LEVEL) "\0"
VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
+ VALUE "ProductName", "LibreOffice\0"
VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
VALUE "InternalName", PPS(RES_APP_NAME) "\0"
VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"