diff options
| author | Raphael Salamon <killekulla@rdrz.de> | 2019-02-13 21:38:11 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-19 19:41:57 +0200 |
| commit | c23ac0b3dcf67d9da6080222955daeda5ddc7a0b (patch) | |
| tree | aa138757ad1a8c1dfff8756067813b834b1e4d0e | |
| parent | 37a962e90c38f094819973d5d45fa25054caa1ca (diff) | |
| download | meson-c23ac0b3dcf67d9da6080222955daeda5ddc7a0b.zip meson-c23ac0b3dcf67d9da6080222955daeda5ddc7a0b.tar.gz meson-c23ac0b3dcf67d9da6080222955daeda5ddc7a0b.tar.bz2 | |
Allow custom targets with same name in project and subprojects
closes #4377
| -rw-r--r-- | mesonbuild/build.py | 3 | ||||
| -rwxr-xr-x | run_unittests.py | 4 | ||||
| -rw-r--r-- | test cases/common/87 identical target name in subproject/meson.build | 1 | ||||
| -rw-r--r-- | test cases/common/87 identical target name in subproject/subprojects/foo/meson.build | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index e8aa8f4..2187d3e 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1890,9 +1890,6 @@ class CustomTarget(Target): repr_str = "<{0} {1}: {2}>" return repr_str.format(self.__class__.__name__, self.get_id(), self.command) - def get_id(self): - return self.name + self.type_suffix() - def get_target_dependencies(self): deps = self.dependencies[:] deps += self.extra_depends diff --git a/run_unittests.py b/run_unittests.py index e4e74d6..ba0527d 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2677,7 +2677,7 @@ int main(int argc, char **argv) { self.init(testdir) expected = { 'bindat@cus': ['data_source.txt'], - 'depfile@cus': [], + 'a685fbc@@depfile@cus': [], } t_intro = self.introspect('--targets') self.assertCountEqual([t['id'] for t in t_intro], expected) @@ -4577,7 +4577,7 @@ class LinuxlikeTests(BasePlatformTests): docbook_target = t break self.assertIsInstance(docbook_target, dict) - ifile = self.introspect(['--target-files', 'generated-gdbus-docbook@cus'])[0] + ifile = self.introspect(['--target-files', '8d60afc@@generated-gdbus-docbook@cus'])[0] self.assertListEqual(t['filename'], [os.path.join(self.builddir, 'gdbus/generated-gdbus-doc-' + os.path.basename(ifile))]) def test_build_rpath(self): diff --git a/test cases/common/87 identical target name in subproject/meson.build b/test cases/common/87 identical target name in subproject/meson.build index e804d3c..c5be5b7 100644 --- a/test cases/common/87 identical target name in subproject/meson.build +++ b/test cases/common/87 identical target name in subproject/meson.build @@ -4,3 +4,4 @@ subproject('foo') executable('bar', 'bar.c') run_target('nop', command : ['true']) +custom_target('cus', output: ['cus.c'], command : ['true']) diff --git a/test cases/common/87 identical target name in subproject/subprojects/foo/meson.build b/test cases/common/87 identical target name in subproject/subprojects/foo/meson.build index 3f22337..06addb4 100644 --- a/test cases/common/87 identical target name in subproject/subprojects/foo/meson.build +++ b/test cases/common/87 identical target name in subproject/subprojects/foo/meson.build @@ -2,3 +2,4 @@ project('subfoo', 'c') executable('bar', 'bar.c') run_target('nop', command : ['true']) +custom_target('cus', output: ['cus.c'], command : ['true']) |