Skip to content

Commit

Permalink
wscript: fix mod_options.txt parsing under Python2
Browse files Browse the repository at this point in the history
  • Loading branch information
a1batross committed Jul 2, 2023
1 parent f0f4e55 commit fa03ed3
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -214,18 +214,19 @@ def configure(conf):
with open('mod_options.txt') as fd:
lines = fd.readlines()
for line in lines:
p = regex.match(line.strip())
if p:
conf.start_msg("* " + p[3])
if p[2] == 'ON':
conf.env[p[1]] = True
conf.define(p[1], 1)
elif p[2] == 'OFF':
conf.env[p[1]] = False
conf.undefine(p[1])
m = regex.match(line.strip())
if m:
p = m.groups()
conf.start_msg("* " + p[2])
if p[1] == 'ON':
conf.env[p[0]] = True
conf.define(p[0], 1)
elif p[1] == 'OFF':
conf.env[p[0]] = False
conf.undefine(p[0])
else:
conf.env[p[1]] = p[2]
conf.end_msg(p[2])
conf.env[p[0]] = p[1]
conf.end_msg(p[1])
if conf.env.HLDEMO_BUILD and conf.env.OEM_BUILD:
conf.fatal('Don\'t mix Demo and OEM builds!')

Expand Down

0 comments on commit fa03ed3

Please sign in to comment.