diff options
author | Andras Timar <atimar@suse.com> | 2011-12-10 16:47:02 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2011-12-10 22:25:28 +0100 |
commit | 3fbedc3e8f65c91999dcee42daa8312e387dcf40 (patch) | |
tree | 77e876cf4bfbe75c9b0126f8590287e1909c5a1b /desktop/util | |
parent | fix build with MSVC (diff) | |
download | core-3fbedc3e8f65c91999dcee42daa8312e387dcf40.tar.gz core-3fbedc3e8f65c91999dcee42daa8312e387dcf40.zip |
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/util')
-rw-r--r-- | desktop/util/officeloader.rc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc index f968f8ad84d7..b6e2687b0e8a 100644 --- a/desktop/util/officeloader.rc +++ b/desktop/util/officeloader.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,12 +54,13 @@ 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 "OriginalFilename", "SOFFICE.EXE\0" - VALUE "InternalName", "SOFFICE\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" } } |