immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix release script version override 

This fixes a bug in 94a18e9648
1008-fix
krzys-h 2018-05-10 21:16:42 +02:00
parent acc3362172
commit 7aaac449f5
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/release.py
View File

@ -77,21 +77,20 @@ for i in range(len(data)):
if m: if m:
x = m.group(3) x = m.group(3)
if m.group(1) == 'MAJOR': if m.group(1) == 'MAJOR':
if version_override is None: if version_override is not None:
major = x x = version_override[0]
else: major = x
major = version_override[0]
elif m.group(1) == 'MINOR': elif m.group(1) == 'MINOR':
if version_override is None: if version_override is not None:
minor = x x = version_override[1]
else: minor = x
minor = version_override[1]
elif m.group(1) == 'REVISION': elif m.group(1) == 'REVISION':
if version_override is None: if version_override is not None:
x = version_override[2]
else:
# Increase revision number # Increase revision number
revision = str(int(x) + 1) revision = str(int(x) + 1)
else: revision = x
revision = version_override[2]
data[i] = 'set(COLOBOT_VERSION_'+m.group(1)+m.group(2)+x+')\n' data[i] = 'set(COLOBOT_VERSION_'+m.group(1)+m.group(2)+x+')\n'
m = re.match(r'^(#?)set\(COLOBOT_VERSION_(UNRELEASED|RELEASE_CODENAME)( +)"(.+)"\)$', data[i]) m = re.match(r'^(#?)set\(COLOBOT_VERSION_(UNRELEASED|RELEASE_CODENAME)( +)"(.+)"\)$', data[i])