TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Always pass tuple for argument prefix list

Browse source 
Fixes: dd59be7163 ("Cache various SConstruct temporaries")
This commit is contained in:
Kp 2015-12-04 03:36:33 +00:00
parent aaaa7e6aa4
commit 60e6c23ccc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SConstruct
View file

@ -2930,7 +2930,7 @@ class DXXCommon(LazyObjectConstructor):
# windows or *nix? # windows or *nix?
platform_name = self.user_settings.host_platform platform_name = self.user_settings.host_platform
message(self, "compiling on %s for %s into %s%s" % (sys.platform, platform_name, self.user_settings.builddir or '.', message(self, "compiling on %s for %s into %s%s" % (sys.platform, platform_name, self.user_settings.builddir or '.',
(' with prefix list %s' % self._argument_prefix_list) if self._argument_prefix_list else '')) (' with prefix list %s' % str(self._argument_prefix_list)) if self._argument_prefix_list else ''))
return ( return (
self.Win32PlatformSettings if platform_name == 'win32' else ( self.Win32PlatformSettings if platform_name == 'win32' else (
self.DarwinPlatformSettings if platform_name == 'darwin' else self.DarwinPlatformSettings if platform_name == 'darwin' else
@ -3619,12 +3619,12 @@ def register_program(program,other_program):
# Fallback case: build the regular configuration. # Fallback case: build the regular configuration.
if len(l) == 1: if len(l) == 1:
try: try:
if int(l[0]): r = int(l[0])
return [program((s,''), variables)]
return []
except ValueError: except ValueError:
# If not an integer, treat this as a configuration profile. # If not an integer, treat this as a configuration profile.
pass pass
else:
return [program((s,''), variables)] if r else []
r = [] r = []
seen = set() seen = set()
for e in l: for e in l:
@ -3634,7 +3634,7 @@ def register_program(program,other_program):
if prefix in seen: if prefix in seen:
continue continue
seen.add(prefix) seen.add(prefix)
prefix = ['%s%s%s' % (s, '_' if p else '', p) for p in prefix] + list(prefix) prefix = tuple('%s%s%s' % (s, '_' if p else '', p) for p in prefix) + prefix
r.append(program(prefix, variables)) r.append(program(prefix, variables))
return r return r
d1x = register_program(D1XProgram, D2XProgram) d1x = register_program(D1XProgram, D2XProgram)