Merge pull request #10147 from dcbaker/submit/structured-sources-subdir

structured_sources: fix subdir handling

10 files changed, 31 insertions, 0 deletions

diff --git a/test cases/rust/18 structured sources/gen.py b/test cases/rust/19 structured sources/gen.py
index 16e5c04e1..16e5c04e1 100755
--- a/test cases/rust/18 structured sources/gen.py
+++ b/test cases/rust/19 structured sources/gen.py
diff --git a/test cases/rust/19 structured sources/main-gen-copy.rs b/test cases/rust/19 structured sources/main-gen-copy.rs
new file mode 100644
index 000000000..db66a515a
--- /dev/null
+++ b/test cases/rust/19 structured sources/main-gen-copy.rs
@@ -0,0 +1,5 @@
+include!(r#"@dir@/include.rs"#);
+
+pub fn main() {
+    priv_func();
+}
diff --git a/test cases/rust/18 structured sources/meson.build b/test cases/rust/19 structured sources/meson.build
index 8fa044364..d84e83f15 100644
--- a/test cases/rust/18 structured sources/meson.build
+++ b/test cases/rust/19 structured sources/meson.build
@@ -37,3 +37,22 @@ executable(
 )
 
 test('no-copy', find_program('no_copy_test.py'), args : meson.current_build_dir())
+
+subdir('src2')
+
+executable('copy-no-gen', srcs2)
+
+m_src = configure_file(
+  input : 'main-gen-copy.rs',
+  output : 'main-gen-copy.rs',
+  configuration : {'dir' : meson.current_build_dir().replace('\\', '/')},
+)
+
+m_src2 = configure_file(
+  input : 'priv.rs',
+  output : 'include.rs',
+  copy : true
+)
+
+executable('gen-no-copy', structured_sources([m_src, m_src2]))
+
diff --git a/test cases/rust/18 structured sources/no_copy_test.py b/test cases/rust/19 structured sources/no_copy_test.py
index 91506b20f..91506b20f 100755
--- a/test cases/rust/18 structured sources/no_copy_test.py
+++ b/test cases/rust/19 structured sources/no_copy_test.py
diff --git a/test cases/rust/19 structured sources/priv.rs b/test cases/rust/19 structured sources/priv.rs
new file mode 100644
index 000000000..aad196b49
--- /dev/null
+++ b/test cases/rust/19 structured sources/priv.rs
@@ -0,0 +1,3 @@
+fn priv_func() {
+    std::process::exit(0);
+}
diff --git a/test cases/rust/18 structured sources/src/foo.rs.in b/test cases/rust/19 structured sources/src/foo.rs.in
index 4f3fc4263..4f3fc4263 100644
--- a/test cases/rust/18 structured sources/src/foo.rs.in
+++ b/test cases/rust/19 structured sources/src/foo.rs.in
diff --git a/test cases/rust/18 structured sources/src/main.rs b/test cases/rust/19 structured sources/src/main.rs
index 3ffeee2be..3ffeee2be 100644
--- a/test cases/rust/18 structured sources/src/main.rs
+++ b/test cases/rust/19 structured sources/src/main.rs
diff --git a/test cases/rust/18 structured sources/src2/foo/mod.rs b/test cases/rust/19 structured sources/src2/foo/mod.rs
index 9463d95b8..9463d95b8 100644
--- a/test cases/rust/18 structured sources/src2/foo/mod.rs
+++ b/test cases/rust/19 structured sources/src2/foo/mod.rs
diff --git a/test cases/rust/18 structured sources/src2/main-unique.rs b/test cases/rust/19 structured sources/src2/main-unique.rs
index 3ffeee2be..3ffeee2be 100644
--- a/test cases/rust/18 structured sources/src2/main-unique.rs
+++ b/test cases/rust/19 structured sources/src2/main-unique.rs
diff --git a/test cases/rust/19 structured sources/src2/meson.build b/test cases/rust/19 structured sources/src2/meson.build
new file mode 100644
index 000000000..b4844d272
--- /dev/null
+++ b/test cases/rust/19 structured sources/src2/meson.build
@@ -0,0 +1,4 @@
+srcs2 = structured_sources(
+  ['main-unique.rs'],
+  {'foo': 'foo/mod.rs'},
+)