Generalize buildnum patching for both `clientversion.h` and `configure.ac`.
This commit is contained in:
parent
482291582e
commit
ab55424763
|
@ -108,7 +108,8 @@ def initialize_git(release):
|
||||||
|
|
||||||
def patch_version_in_files(release, releaseprev):
|
def patch_version_in_files(release, releaseprev):
|
||||||
patch_README(release, releaseprev)
|
patch_README(release, releaseprev)
|
||||||
patch_clientversion_h(release, releaseprev)
|
patch_clientversion_h(release)
|
||||||
|
patch_configure_ac(release)
|
||||||
|
|
||||||
|
|
||||||
# Helper code:
|
# Helper code:
|
||||||
|
@ -129,16 +130,31 @@ def patch_README(release, releaseprev):
|
||||||
outf.write(inf.read())
|
outf.write(inf.read())
|
||||||
|
|
||||||
|
|
||||||
def patch_clientversion_h(release, releaseprev):
|
def patch_clientversion_h(release):
|
||||||
rgx = re.compile(
|
_patch_build_defs(
|
||||||
r'^(#define CLIENT_VERSION_(MAJOR|MINOR|REVISION|BUILD|IS_RELEASE))'
|
release,
|
||||||
r' \d+$'
|
'src/clientversion.h',
|
||||||
|
(r'^(#define CLIENT_VERSION_(MAJOR|MINOR|REVISION|BUILD|IS_RELEASE))'
|
||||||
|
r' \d+()$'),
|
||||||
)
|
)
|
||||||
with PathPatcher('src/clientversion.h') as (inf, outf):
|
|
||||||
|
|
||||||
|
def patch_configure_ac(release):
|
||||||
|
_patch_build_defs(
|
||||||
|
release,
|
||||||
|
'configure.ac',
|
||||||
|
(r'^(define\(_CLIENT_VERSION_(MAJOR|MINOR|REVISION|BUILD|IS_RELEASE),)'
|
||||||
|
r' \d+(\))$'),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _patch_build_defs(release, path, pattern):
|
||||||
|
rgx = re.compile(pattern)
|
||||||
|
with PathPatcher(path) as (inf, outf):
|
||||||
for line in inf:
|
for line in inf:
|
||||||
m = rgx.match(line)
|
m = rgx.match(line)
|
||||||
if m:
|
if m:
|
||||||
prefix, label = m.groups()
|
prefix, label, suffix = m.groups()
|
||||||
repl = {
|
repl = {
|
||||||
'MAJOR': release.major,
|
'MAJOR': release.major,
|
||||||
'MINOR': release.minor,
|
'MINOR': release.minor,
|
||||||
|
@ -148,7 +164,7 @@ def patch_clientversion_h(release, releaseprev):
|
||||||
'false' if release.betarc == 'beta' else 'true'
|
'false' if release.betarc == 'beta' else 'true'
|
||||||
),
|
),
|
||||||
}[label]
|
}[label]
|
||||||
outf.write('{} {}\n'.format(prefix, repl))
|
outf.write('{} {}{}\n'.format(prefix, repl, suffix))
|
||||||
else:
|
else:
|
||||||
outf.write(line)
|
outf.write(line)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue