devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Correctly insert build ID.

Browse source 
Change-Id: I35a85ffd78bd0a56a31d6ba0abbd6102727155d4
This commit is contained in:
Dominik Riebeling 2012-03-06 22:06:40 +01:00
parent 7d2c7b83b5
commit 06662985cb
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
utils/common/deploy-rbutil.py
View file

@ -57,7 +57,7 @@ deploy.progexe = {
} }
deploy.regreplace = { deploy.regreplace = {
"rbutil/rbutilqt/version.h" : [["\$Rev\$", "%REVISION%"], "rbutil/rbutilqt/version.h" : [["\$Rev\$", "%REVISION%"],
["(^#define BUILDID).*", "\\1 \"-%BUILDID%\""]], ["(^#define BUILDID).*", "\\1 \"%BUILDID%\""]],
"rbutil/rbutilqt/Info.plist" : [["\$Rev\$", "%REVISION%"]], "rbutil/rbutilqt/Info.plist" : [["\$Rev\$", "%REVISION%"]],
} }
# OS X 10.6 defaults to gcc 4.2. Building universal binaries that are # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are

7
utils/common/deploy.py
View file

@ -569,9 +569,12 @@ def deploy():
# replacements made on the replacement string: # replacements made on the replacement string:
# %REVISION% is replaced with the revision number # %REVISION% is replaced with the revision number
replacement = re.sub("%REVISION%", str(revision), r[1]) replacement = re.sub("%REVISION%", str(revision), r[1])
# %BUILD% is replace with buildid as passed on the command line newline = re.sub(r[0], replacement, newline)
# %BUILD% is replaced with buildid as passed on the command line
if buildid != None: if buildid != None:
replacement = re.sub("%BUILDID%", str(buildid), replacement) replacement = re.sub("%BUILDID%", "-" + str(buildid), replacement)
else:
replacement = re.sub("%BUILDID%", "", replacement)
newline = re.sub(r[0], replacement, newline) newline = re.sub(r[0], replacement, newline)
outfile.write(newline) outfile.write(newline)
outfile.close() outfile.close()