diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-07-01 19:06:34 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-07-01 19:06:34 +0200 |
commit | 644b83e0b4b47911f35ea34976d767f020f42f4e (patch) | |
tree | b47d02b68886a88b6f0b255348b6a1d33ce0addd | |
parent | c3a2b20ef2e1cf630a4863e57a6a403291fd2ba3 (diff) | |
download | rockbox-644b83e0b4b47911f35ea34976d767f020f42f4e.tar.gz rockbox-644b83e0b4b47911f35ea34976d767f020f42f4e.zip |
Add version information to Windows file properties.
Windows can show the version in the file properties. This requires an
additional entry in its resource. Restructure global version defines since the
former requires a different format than used previously.
Change-Id: I2bf261a02ea8e0af6dc081568960debfb779d396
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.rc | 34 | ||||
-rw-r--r-- | rbutil/rbutilqt/version.h | 10 |
2 files changed, 42 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.rc b/rbutil/rbutilqt/rbutilqt.rc index 8b7938b69c..8ffe2b2424 100644 --- a/rbutil/rbutilqt/rbutilqt.rc +++ b/rbutil/rbutilqt/rbutilqt.rc | |||
@@ -1,2 +1,34 @@ | |||
1 | 1 24 MOVEABLE PURE "rbutilqt.manifest" | 1 | #include <windows.h> |
2 | #include "version.h" | ||
3 | 1 MANIFEST MOVEABLE PURE "rbutilqt.manifest" | ||
2 | RBUTIL_ICON ICON DISCARDABLE "icons/rockbox.ico" | 4 | RBUTIL_ICON ICON DISCARDABLE "icons/rockbox.ico" |
5 | |||
6 | // Version Info | ||
7 | |||
8 | VS_VERSION_INFO VERSIONINFO | ||
9 | FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_MICRO,VERSION_PATCH | ||
10 | PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_MICRO,VERSION_PATCH | ||
11 | FILEFLAGSMASK 0x17L | ||
12 | FILEFLAGS 0x0L | ||
13 | FILEOS 0x4L | ||
14 | FILETYPE 0x0L | ||
15 | FILESUBTYPE 0x0L | ||
16 | BEGIN | ||
17 | BLOCK "StringFileInfo" | ||
18 | BEGIN | ||
19 | BLOCK "000004b0" | ||
20 | BEGIN | ||
21 | VALUE "FileDescription", "Rockbox Utility" | ||
22 | VALUE "FileVersion", VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO) | ||
23 | VALUE "LegalCopyright", "Rockbox developers" | ||
24 | VALUE "ProductName", "Rockbox Utility" | ||
25 | VALUE "ProductVersion", VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO) | ||
26 | VALUE "OriginalFilename", "RockboxUtility.exe" | ||
27 | END | ||
28 | END | ||
29 | BLOCK "VarFileInfo" | ||
30 | BEGIN | ||
31 | VALUE "Translation", 0x0, 1200 | ||
32 | END | ||
33 | END | ||
34 | |||
diff --git a/rbutil/rbutilqt/version.h b/rbutil/rbutilqt/version.h index a4a007867e..ac3728c630 100644 --- a/rbutil/rbutilqt/version.h +++ b/rbutil/rbutilqt/version.h | |||
@@ -26,7 +26,15 @@ | |||
26 | // rebuilds because of issues like dependency problems or library updates). | 26 | // rebuilds because of issues like dependency problems or library updates). |
27 | // Usually empty. | 27 | // Usually empty. |
28 | #define BUILDID "" | 28 | #define BUILDID "" |
29 | #define VERSION "1.2.14" BUILDID | 29 | // Version string is constructed from parts, since the Windows rc file needs it |
30 | // combined differently. | ||
31 | #define VERSION_MAJOR 1 | ||
32 | #define VERSION_MINOR 2 | ||
33 | #define VERSION_MICRO 14 | ||
34 | #define VERSION_PATCH 0 | ||
35 | #define STR(x) #x | ||
36 | #define VERSIONSTRING(a, b, c) STR(a) "." STR(b) "." STR(c) | ||
37 | #define VERSION VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO) BUILDID | ||
30 | // PUREVERSION should identify the build uniquely. Use version string for now. | 38 | // PUREVERSION should identify the build uniquely. Use version string for now. |
31 | #define PUREVERSION "$Rev$" | 39 | #define PUREVERSION "$Rev$" |
32 | 40 | ||