FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 01:46:15 +01:00
Code Issues Projects Releases Wiki Activity

Handle non-string and non-list values in substitutions (subst)

Browse Source
This commit is contained in:
Thomas Nagy 2015-02-07 22:27:54 +01:00
parent 15d14c7bdf
commit d68e1ff072
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demos/subst/test.pc.in
View File

@ -3,3 +3,4 @@ Description: ПРИЛОЖЕНИЕ
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgnaa @LIBS@ @XPM_LIBS@ @LIBICONV@ Libs: -L${libdir} -lgnaa @LIBS@ @XPM_LIBS@ @LIBICONV@
Cflags: -I${includedir} @XPM_CFLAGS@ Cflags: -I${includedir} @XPM_CFLAGS@
extra: @INTVAR@

2
demos/subst/wscript
View File

@ -13,7 +13,7 @@ def configure(conf):
def build(bld): def build(bld):
# the test.pc.in is a special case which is always handled # the test.pc.in is a special case which is always handled
bld(source='test.pc.in', VERSION='1.1', LIBS='moo', XPM_LIBS='-lxpm', LIBICONV='-liconv', XPM_CFLAGS='-O3') bld(source='test.pc.in', VERSION='1.1', LIBS='moo', XPM_LIBS='-lxpm', LIBICONV='-liconv', XPM_CFLAGS='-O3', INTVAR=12)
tg = bld( tg = bld(
features = 'subst', # the feature 'subst' overrides the source/target processing features = 'subst', # the feature 'subst' overrides the source/target processing

8
waflib/TaskGen.py
View File

@ -701,8 +701,12 @@ class subst_pc(Task.Task):
except AttributeError: except AttributeError:
d = {} d = {}
for x in lst: for x in lst:
tmp = getattr(self.generator, x, '') or self.env.get_flat(x) or self.env.get_flat(x.upper()) tmp = getattr(self.generator, x, '') or self.env[x] or self.env[x.upper()]
d[x] = str(tmp) try:
tmp = ''.join(tmp)
except TypeError:
tmp = str(tmp)
d[x] = tmp
code = code % d code = code % d
self.outputs[0].write(code, encoding=getattr(self.generator, 'encoding', 'ISO8859-1')) self.outputs[0].write(code, encoding=getattr(self.generator, 'encoding', 'ISO8859-1'))