Reduce code complexity, fix nested array in files instruction
This commit is contained in:
parent
ac8d5f2156
commit
f13887b64a
|
@ -1133,10 +1133,9 @@ int dummy;
|
||||||
if isinstance(gensrc, (build.CustomTarget, build.GeneratedList)) or gensrc.is_built:
|
if isinstance(gensrc, (build.CustomTarget, build.GeneratedList)) or gensrc.is_built:
|
||||||
vala_c_file = os.path.splitext(os.path.basename(vala_file))[0] + '.c'
|
vala_c_file = os.path.splitext(os.path.basename(vala_file))[0] + '.c'
|
||||||
else:
|
else:
|
||||||
realpath = os.path.abspath(os.path.join(self.environment.get_build_dir(), vala_file))
|
path_to_target = os.path.join(self.build_to_src, target.get_subdir())
|
||||||
if (realpath.startswith(os.path.join(self.environment.get_source_dir(), target.get_subdir()))):
|
if vala_file.startswith(path_to_target):
|
||||||
relpath = os.path.relpath(realpath, os.path.join(self.environment.get_source_dir(), target.get_subdir()))
|
vala_c_file = os.path.splitext(os.path.relpath(vala_file, path_to_target))[0] + '.c'
|
||||||
vala_c_file = os.path.join(os.path.dirname(relpath), os.path.splitext(os.path.basename(vala_file))[0] + '.c')
|
|
||||||
else:
|
else:
|
||||||
vala_c_file = os.path.splitext(os.path.basename(vala_file))[0] + '.c'
|
vala_c_file = os.path.splitext(os.path.basename(vala_file))[0] + '.c'
|
||||||
# All this will be placed inside the c_out_dir
|
# All this will be placed inside the c_out_dir
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
project('valatest', 'vala', 'c')
|
project('valatest', 'vala', 'c')
|
||||||
|
|
||||||
valadeps = [dependency('glib-2.0'), dependency('gobject-2.0')]
|
valadeps = [dependency('glib-2.0'), dependency('gobject-2.0')]
|
||||||
valafiles = files([
|
valafiles = files(
|
||||||
'prog.vala',
|
'prog.vala',
|
||||||
'Test.vala',
|
'Test.vala',
|
||||||
'Subdir/Test.vala'
|
'Subdir/Test.vala'
|
||||||
])
|
)
|
||||||
|
|
||||||
e = executable('multidir_prog', valafiles, dependencies : valadeps)
|
e = executable('multidir_prog', valafiles, dependencies : valadeps)
|
||||||
test('valatest', e)
|
test('valatest', e)
|
||||||
|
|
Loading…
Reference in New Issue