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.zip rockbox-7d2c7b83b58086905ef9578cc87c0346e109179e.tar.gz rockbox-7d2c7b83b58086905ef9578cc87c0346e109179e.tar.bz2 rockbox-7d2c7b83b58086905ef9578cc87c0346e109179e.tar.xz | |
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 64f8d7b..08d8af7 100644 --- a/rbutil/rbutilqt/Info.plist +++ b/rbutil/rbutilqt/Info.plist @@ -7,7 +7,7 @@ <key>CFBundleName</key> <string>Rockbox Utility</string> <key>CFBundleShortVersionString</key> - <string>1.2.12</string> + <string>1.2.12 ($Rev$)</string> <key>CFBundleIconFile</key> <string>rbutilqt.icns</string> <key>CFBundleIdentifier</key> diff --git a/rbutil/rbutilqt/version.h b/rbutil/rbutilqt/version.h index a081c19..768c93f 100644 --- a/rbutil/rbutilqt/version.h +++ b/rbutil/rbutilqt/version.h @@ -28,7 +28,7 @@ #define BUILDID "" #define VERSION "1.2.12" BUILDID // PUREVERSION should identify the build uniquely. Use version string for now. -#define PUREVERSION VERSION +#define PUREVERSION "$Rev$" -#define FULLVERSION VERSION", built "__DATE__" "__TIME__ +#define FULLVERSION VERSION" ("PUREVERSION"), built "__DATE__" "__TIME__ diff --git a/utils/common/deploy-rbutil.py b/utils/common/deploy-rbutil.py index 3a23862..389438e 100755 --- a/utils/common/deploy-rbutil.py +++ b/utils/common/deploy-rbutil.py @@ -56,9 +56,9 @@ deploy.progexe = { "linux2" : "RockboxUtility" } deploy.regreplace = { - "rbutil/rbutilqt/version.h" : [["SVN \$.*\$", "SVN r%REVISION%"], + "rbutil/rbutilqt/version.h" : [["\$Rev\$", "%REVISION%"], ["(^#define BUILDID).*", "\\1 \"-%BUILDID%\""]], - "rbutil/rbutilqt/Info.plist" : [["SVN \$.*\$", "SVN r%REVISION%"]], + "rbutil/rbutilqt/Info.plist" : [["\$Rev\$", "%REVISION%"]], } # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are # compatible with 10.4 requires using gcc-4.0. |