diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-03-06 22:06:40 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-03-06 22:06:40 +0100 |
commit | 06662985cb678b17efbd3dfd7aa77da3e25af16b (patch) | |
tree | 7689ea0dec5b656bba963a03239d54808d263a5e | |
parent | 7d2c7b83b58086905ef9578cc87c0346e109179e (diff) | |
download | rockbox-06662985cb678b17efbd3dfd7aa77da3e25af16b.tar.gz rockbox-06662985cb678b17efbd3dfd7aa77da3e25af16b.zip |
Correctly insert build ID.
Change-Id: I35a85ffd78bd0a56a31d6ba0abbd6102727155d4
-rwxr-xr-x | utils/common/deploy-rbutil.py | 2 | ||||
-rwxr-xr-x | utils/common/deploy.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/utils/common/deploy-rbutil.py b/utils/common/deploy-rbutil.py index 389438e920..0a68dbe805 100755 --- a/utils/common/deploy-rbutil.py +++ b/utils/common/deploy-rbutil.py | |||
@@ -57,7 +57,7 @@ deploy.progexe = { | |||
57 | } | 57 | } |
58 | deploy.regreplace = { | 58 | deploy.regreplace = { |
59 | "rbutil/rbutilqt/version.h" : [["\$Rev\$", "%REVISION%"], | 59 | "rbutil/rbutilqt/version.h" : [["\$Rev\$", "%REVISION%"], |
60 | ["(^#define BUILDID).*", "\\1 \"-%BUILDID%\""]], | 60 | ["(^#define BUILDID).*", "\\1 \"%BUILDID%\""]], |
61 | "rbutil/rbutilqt/Info.plist" : [["\$Rev\$", "%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 |
diff --git a/utils/common/deploy.py b/utils/common/deploy.py index 070cea65b5..8f7fd72175 100755 --- a/utils/common/deploy.py +++ b/utils/common/deploy.py | |||
@@ -569,10 +569,13 @@ def deploy(): | |||
569 | # replacements made on the replacement string: | 569 | # replacements made on the replacement string: |
570 | # %REVISION% is replaced with the revision number | 570 | # %REVISION% is replaced with the revision number |
571 | replacement = re.sub("%REVISION%", str(revision), r[1]) | 571 | replacement = re.sub("%REVISION%", str(revision), r[1]) |
572 | # %BUILD% is replace with buildid as passed on the command line | 572 | newline = re.sub(r[0], replacement, newline) |
573 | # %BUILD% is replaced with buildid as passed on the command line | ||
573 | if buildid != None: | 574 | if buildid != None: |
574 | replacement = re.sub("%BUILDID%", str(buildid), replacement) | 575 | replacement = re.sub("%BUILDID%", "-" + str(buildid), replacement) |
575 | newline = re.sub(r[0], replacement, newline) | 576 | else: |
577 | replacement = re.sub("%BUILDID%", "", replacement) | ||
578 | newline = re.sub(r[0], replacement, newline) | ||
576 | outfile.write(newline) | 579 | outfile.write(newline) |
577 | outfile.close() | 580 | outfile.close() |
578 | 581 | ||