diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-03-06 21:45:54 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-03-06 21:45:54 +0100 |
commit | 7d2c7b83b58086905ef9578cc87c0346e109179e (patch) | |
tree | 72608b5bf7e70d2322956528ec47f82b79c58df3 | |
parent | b069562ef4146c2b377d14bbe6cb35f0ff4fd043 (diff) | |
download | rockbox-7d2c7b83b58086905ef9578cc87c0346e109179e.tar.gz rockbox-7d2c7b83b58086905ef9578cc87c0346e109179e.zip |
Rockbox Utility: add "revision" information back.
Add a revision-like information and make deploy.py replace it with the git
hash.
Change-Id: Ic88ad0b2af255e76a7129a6a5cf52663b868fd32
-rw-r--r-- | rbutil/rbutilqt/Info.plist | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/version.h | 4 | ||||
-rwxr-xr-x | utils/common/deploy-rbutil.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/Info.plist b/rbutil/rbutilqt/Info.plist index 64f8d7b3d3..08d8af7062 100644 --- a/rbutil/rbutilqt/Info.plist +++ b/rbutil/rbutilqt/Info.plist | |||
@@ -7,7 +7,7 @@ | |||
7 | <key>CFBundleName</key> | 7 | <key>CFBundleName</key> |
8 | <string>Rockbox Utility</string> | 8 | <string>Rockbox Utility</string> |
9 | <key>CFBundleShortVersionString</key> | 9 | <key>CFBundleShortVersionString</key> |
10 | <string>1.2.12</string> | 10 | <string>1.2.12 ($Rev$)</string> |
11 | <key>CFBundleIconFile</key> | 11 | <key>CFBundleIconFile</key> |
12 | <string>rbutilqt.icns</string> | 12 | <string>rbutilqt.icns</string> |
13 | <key>CFBundleIdentifier</key> | 13 | <key>CFBundleIdentifier</key> |
diff --git a/rbutil/rbutilqt/version.h b/rbutil/rbutilqt/version.h index a081c19fa6..768c93fb75 100644 --- a/rbutil/rbutilqt/version.h +++ b/rbutil/rbutilqt/version.h | |||
@@ -28,7 +28,7 @@ | |||
28 | #define BUILDID "" | 28 | #define BUILDID "" |
29 | #define VERSION "1.2.12" BUILDID | 29 | #define VERSION "1.2.12" BUILDID |
30 | // PUREVERSION should identify the build uniquely. Use version string for now. | 30 | // PUREVERSION should identify the build uniquely. Use version string for now. |
31 | #define PUREVERSION VERSION | 31 | #define PUREVERSION "$Rev$" |
32 | 32 | ||
33 | #define FULLVERSION VERSION", built "__DATE__" "__TIME__ | 33 | #define FULLVERSION VERSION" ("PUREVERSION"), built "__DATE__" "__TIME__ |
34 | 34 | ||
diff --git a/utils/common/deploy-rbutil.py b/utils/common/deploy-rbutil.py index 3a23862b7c..389438e920 100755 --- a/utils/common/deploy-rbutil.py +++ b/utils/common/deploy-rbutil.py | |||
@@ -56,9 +56,9 @@ deploy.progexe = { | |||
56 | "linux2" : "RockboxUtility" | 56 | "linux2" : "RockboxUtility" |
57 | } | 57 | } |
58 | deploy.regreplace = { | 58 | deploy.regreplace = { |
59 | "rbutil/rbutilqt/version.h" : [["SVN \$.*\$", "SVN r%REVISION%"], | 59 | "rbutil/rbutilqt/version.h" : [["\$Rev\$", "%REVISION%"], |
60 | ["(^#define BUILDID).*", "\\1 \"-%BUILDID%\""]], | 60 | ["(^#define BUILDID).*", "\\1 \"-%BUILDID%\""]], |
61 | "rbutil/rbutilqt/Info.plist" : [["SVN \$.*\$", "SVN r%REVISION%"]], | 61 | "rbutil/rbutilqt/Info.plist" : [["\$Rev\$", "%REVISION%"]], |
62 | } | 62 | } |
63 | # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are | 63 | # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are |
64 | # compatible with 10.4 requires using gcc-4.0. | 64 | # compatible with 10.4 requires using gcc-4.0. |