Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Split generator @BASENAME@ at the first extension.

This commit is contained in:
Elliott Sales de Andrade 2016-10-12 20:58:33 -04:00 committed by Jussi Pakkanen
parent abfc95e75a
commit 779788ad82
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/build.py
View File

@ -761,14 +761,14 @@ class Generator():
def get_base_outnames(self, inname): def get_base_outnames(self, inname):
plainname = os.path.split(inname)[1] plainname = os.path.split(inname)[1]
basename = plainname.split('.')[0] basename = os.path.splitext(plainname)[0]
return [x.replace('@BASENAME@', basename).replace('@PLAINNAME@', plainname) for x in self.outputs] return [x.replace('@BASENAME@', basename).replace('@PLAINNAME@', plainname) for x in self.outputs]
def get_dep_outname(self, inname): def get_dep_outname(self, inname):
if self.depfile is None: if self.depfile is None:
raise InvalidArguments('Tried to get dep name for rule that does not have dependency file defined.') raise InvalidArguments('Tried to get dep name for rule that does not have dependency file defined.')
plainname = os.path.split(inname)[1] plainname = os.path.split(inname)[1]
basename = plainname.split('.')[0] basename = os.path.splitext(plainname)[0]
return self.depfile.replace('@BASENAME@', basename).replace('@PLAINNAME@', plainname) return self.depfile.replace('@BASENAME@', basename).replace('@PLAINNAME@', plainname)
def get_arglist(self): def get_arglist(self):

4
test cases/common/118 allgenerate/meson.build
View File

@ -5,7 +5,7 @@ project('all sources generated', 'c', 'cpp')
comp = find_program('converter.py') comp = find_program('converter.py')
g = generator(comp, g = generator(comp,
output : '@BASENAME@.cpp', output : '@BASENAME@',
arguments : ['@INPUT@', '@OUTPUT@']) arguments : ['@INPUT@', '@OUTPUT@'])
c = g.process('foobar.cpp.in') c = g.process('foobar.cpp.in')
@ -17,4 +17,4 @@ c2 = custom_target('c2gen',
input : 'foobar.cpp.in', input : 'foobar.cpp.in',
command : [comp, '@INPUT@', '@OUTPUT@']) command : [comp, '@INPUT@', '@OUTPUT@'])
prog2 = executable('genexe2', c2) prog2 = executable('genexe2', c2)