From d87925dc3a45fce97603b6165fb489c30e004b4d Mon Sep 17 00:00:00 2001 From: Szabi Tolnai Date: Fri, 8 May 2020 12:34:49 +0100 Subject: Allow indexed custom target to be used in executable's depends. Change-Id: I7f3e0e0dd9c413d7f6e3267de9664b89f2294e27 --- mesonbuild/build.py | 2 +- .../233 link depends indexed custom target/foo.c | 15 +++++++++++++++ .../make_file.py | 8 ++++++++ .../meson.build | 19 +++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 test cases/common/233 link depends indexed custom target/foo.c create mode 100644 test cases/common/233 link depends indexed custom target/make_file.py create mode 100644 test cases/common/233 link depends indexed custom target/meson.build diff --git a/mesonbuild/build.py b/mesonbuild/build.py index fbf2b179f..2b4b1b980 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -729,7 +729,7 @@ class BuildTarget(Target): File.from_source_file(environment.source_dir, self.subdir, s)) elif hasattr(s, 'get_outputs'): self.link_depends.extend( - [File.from_built_file(s.subdir, p) for p in s.get_outputs()]) + [File.from_built_file(s.get_subdir(), p) for p in s.get_outputs()]) else: raise InvalidArguments( 'Link_depends arguments must be strings, Files, ' diff --git a/test cases/common/233 link depends indexed custom target/foo.c b/test cases/common/233 link depends indexed custom target/foo.c new file mode 100644 index 000000000..58c86a62b --- /dev/null +++ b/test cases/common/233 link depends indexed custom target/foo.c @@ -0,0 +1,15 @@ +#include + +int main(void) { + const char *fn = DEPFILE; + FILE *f = fopen(fn, "r"); + if (!f) { + printf("could not open %s", fn); + return 1; + } + else { + printf("successfully opened %s", fn); + } + + return 0; +} diff --git a/test cases/common/233 link depends indexed custom target/make_file.py b/test cases/common/233 link depends indexed custom target/make_file.py new file mode 100644 index 000000000..6a43b7d05 --- /dev/null +++ b/test cases/common/233 link depends indexed custom target/make_file.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 +import sys + +with open(sys.argv[1], 'w') as f: + print('# this file does nothing', file=f) + +with open(sys.argv[2], 'w') as f: + print('# this file does nothing', file=f) diff --git a/test cases/common/233 link depends indexed custom target/meson.build b/test cases/common/233 link depends indexed custom target/meson.build new file mode 100644 index 000000000..5c066e98d --- /dev/null +++ b/test cases/common/233 link depends indexed custom target/meson.build @@ -0,0 +1,19 @@ +project('link_depends_indexed_custom_target', 'c') + +if meson.backend().startswith('vs') + # FIXME: Broken on the VS backends + error('MESON_SKIP_TEST see https://github.com/mesonbuild/meson/issues/1799') +endif + +cmd = find_program('make_file.py') + +dep_files = custom_target('gen_dep', + command: [cmd, '@OUTPUT@'], + output: ['dep_file1', 'dep_file2']) + +exe = executable('foo', 'foo.c', + link_depends: dep_files[1], + c_args: ['-DDEPFILE="' + dep_files[0].full_path()+ '"']) + +# check that dep_file1 exists, which means that link_depends target ran +test('runtest', exe) -- cgit v1.2.1