tjh.dev
1diff --git a/SConstruct b/SConstruct
2index 4358a23..6ce7776 100644
3--- a/SConstruct
4+++ b/SConstruct
5@@ -55,7 +55,7 @@ def RawListVariable(key, help, default):
6 # To be used to ensure a PREFIX directory is only created when installing.
7 def createPathIsDirCreateWithTarget(target):
8 def my_validator(key, val, env):
9- build_targets = (map(str, BUILD_TARGETS))
10+ build_targets = (list(map(str, BUILD_TARGETS)))
11 if target in build_targets:
12 return PathVariable.PathIsDirCreate(key, val, env)
13 else:
14@@ -155,6 +155,8 @@ if sys.platform == 'win32':
15 env = Environment(variables=opts,
16 tools=('default', 'textfile',),
17 CPPPATH=['.', ],
18+ AR=os.environ['AR'],
19+ ENV=os.environ,
20 )
21
22 env.Append(BUILDERS = {
23@@ -163,9 +164,9 @@ env.Append(BUILDERS = {
24 suffix='.def', src_suffix='.h')
25 })
26
27-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
28- 'SERF_MINOR_VERSION ([0-9]+).*'
29- 'SERF_PATCH_VERSION ([0-9]+)',
30+match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
31+ b'SERF_MINOR_VERSION ([0-9]+).*'
32+ b'SERF_PATCH_VERSION ([0-9]+)',
33 env.File('serf.h').get_contents(),
34 re.DOTALL)
35 MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
36@@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
37
38 unknown = opts.UnknownVariables()
39 if unknown:
40- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
41+ print('Warning: Used unknown variables:', ', '.join(list(unknown.keys())))
42
43 apr = str(env['APR'])
44 apu = str(env['APU'])