Add submodule dependency filesHEADmaster

Change-Id: Iaf8d18082d3991dec7c0ebbea540f092188eb4ec

15 files changed, 93 insertions, 0 deletions

diff --git a/meson/test cases/common/153 wrap file should not failed/meson.build b/meson/test cases/common/153 wrap file should not failed/meson.build
new file mode 100644
index 000000000..48d10688a
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/meson.build
@@ -0,0 +1,16 @@
+project('mainproj', 'c',
+  default_options : ['wrap_mode=nodownload'],
+)
+
+subproject('zlib')
+foo = subproject('foo')
+bar = subproject('bar')
+
+libfoo = foo.get_variable('libfoo')
+libbar = bar.get_variable('libbar')
+
+executable('grabprog', files('src/subprojects/prog.c'))
+executable('grabprog2', files('src/subprojects/foo/prog2.c'))
+subdir('src')
+
+subproject('patchdir')
diff --git a/meson/test cases/common/153 wrap file should not failed/src/meson.build b/meson/test cases/common/153 wrap file should not failed/src/meson.build
new file mode 100644
index 000000000..0c82165d1
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/src/meson.build
@@ -0,0 +1,6 @@
+executable('grabprog3', files('subprojects/prog.c'))
+executable('grabprog4', files('subprojects/foo/prog2.c'))
+
+texe = executable('testexe', files('test.c'), link_with: [libfoo, libbar])
+
+test('t1', texe)
diff --git a/meson/test cases/common/153 wrap file should not failed/src/subprojects/foo/prog2.c b/meson/test cases/common/153 wrap file should not failed/src/subprojects/foo/prog2.c
new file mode 100644
index 000000000..849b40004
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/src/subprojects/foo/prog2.c
@@ -0,0 +1,7 @@
+#include<stdio.h>
+
+int main(void) {
+    printf("Do not have a file layout like this in your own projects.\n");
+    printf("This is only to test that this works.\n");
+    return 0;
+}
diff --git a/meson/test cases/common/153 wrap file should not failed/src/subprojects/prog.c b/meson/test cases/common/153 wrap file should not failed/src/subprojects/prog.c
new file mode 100644
index 000000000..849b40004
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/src/subprojects/prog.c
@@ -0,0 +1,7 @@
+#include<stdio.h>
+
+int main(void) {
+    printf("Do not have a file layout like this in your own projects.\n");
+    printf("This is only to test that this works.\n");
+    return 0;
+}
diff --git a/meson/test cases/common/153 wrap file should not failed/src/test.c b/meson/test cases/common/153 wrap file should not failed/src/test.c
new file mode 100644
index 000000000..34cf99183
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/src/test.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+
+int bar_dummy_func(void);
+int dummy_func(void);
+
+int main(void) {
+    printf("Hello world %d\n", bar_dummy_func() + dummy_func());
+    return 0;
+}
diff --git a/meson/test cases/common/153 wrap file should not failed/subprojects/.gitignore b/meson/test cases/common/153 wrap file should not failed/subprojects/.gitignore
new file mode 100644
index 000000000..aabded6b2
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/subprojects/.gitignore
@@ -0,0 +1,3 @@
+/foo-1.0
+/bar-1.0
+/foo-1.0-patchdir
diff --git a/meson/test cases/common/153 wrap file should not failed/subprojects/bar.wrap b/meson/test cases/common/153 wrap file should not failed/subprojects/bar.wrap
new file mode 100644
index 000000000..4e8f7e392
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/subprojects/bar.wrap
@@ -0,0 +1,8 @@
+[wrap-file]
+directory = bar-1.0
+lead_directory_missing = true
+
+source_filename = bar-1.0.tar.xz
+source_hash     = f0f61948530dc0d33e3028cd71a9f8ee869f6b3665960d8f41d715cf4aed6467
+
+patch_filename  = bar-1.0-patch.tar.xz
diff --git a/meson/test cases/common/153 wrap file should not failed/subprojects/foo.wrap b/meson/test cases/common/153 wrap file should not failed/subprojects/foo.wrap
new file mode 100644
index 000000000..c67c5e5db
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/subprojects/foo.wrap
@@ -0,0 +1,11 @@
+[wrap-file]
+directory = foo-1.0
+
+source_url = http://something.invalid
+source_filename = foo-1.0.tar.xz
+source_hash = 9ed8f67d75e43d3be161efb6eddf30dd01995a958ca83951ea64234bac8908c1
+lead_directory_missing = true
+
+patch_url = https://something.invalid/patch
+patch_filename = foo-1.0-patch.tar.xz
+patch_hash = d0ddc5e60fdb27d808552f5ac8d0bb603ea2cba306538b4427b985535b26c9c5
diff --git a/meson/test cases/common/153 wrap file should not failed/subprojects/packagefiles/bar-1.0-patch.tar.xz b/meson/test cases/common/153 wrap file should not failed/subprojects/packagefiles/bar-1.0-patch.tar.xz
new file mode 100644
index 000000000..f257a1965
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/subprojects/packagefiles/bar-1.0-patch.tar.xz
diff --git a/meson/test cases/common/153 wrap file should not failed/subprojects/packagefiles/bar-1.0.tar.xz b/meson/test cases/common/153 wrap file should not failed/subprojects/packagefiles/bar-1.0.tar.xz
new file mode 100644
index 000000000..d90a9e8b0
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/subprojects/packagefiles/bar-1.0.tar.xz
diff --git a/meson/test cases/common/153 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build b/meson/test cases/common/153 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build
new file mode 100644
index 000000000..dbaf91f2b
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/subprojects/packagefiles/foo-1.0/meson.build
@@ -0,0 +1,2 @@
+project('static lib patchdir', 'c')
+libfoo = static_library('foo', 'foo.c')
diff --git a/meson/test cases/common/153 wrap file should not failed/subprojects/patchdir.wrap b/meson/test cases/common/153 wrap file should not failed/subprojects/patchdir.wrap
new file mode 100644
index 000000000..1a2134c3d
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/subprojects/patchdir.wrap
@@ -0,0 +1,9 @@
+[wrap-file]
+directory = foo-1.0-patchdir
+
+source_url = http://something.invalid
+source_filename = foo-1.0.tar.xz
+source_hash = 9ed8f67d75e43d3be161efb6eddf30dd01995a958ca83951ea64234bac8908c1
+lead_directory_missing = true
+
+patch_directory = foo-1.0
diff --git a/meson/test cases/common/153 wrap file should not failed/subprojects/zlib-1.2.8/foo.c b/meson/test cases/common/153 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
new file mode 100644
index 000000000..267b43aa5
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
@@ -0,0 +1,3 @@
+int dummy_func(void) {
+    return 42;
+}
diff --git a/meson/test cases/common/153 wrap file should not failed/subprojects/zlib-1.2.8/meson.build b/meson/test cases/common/153 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
new file mode 100644
index 000000000..70d493fcc
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/subprojects/zlib-1.2.8/meson.build
@@ -0,0 +1,2 @@
+project('shared lib', 'c')
+library('foo', 'foo.c')
diff --git a/meson/test cases/common/153 wrap file should not failed/subprojects/zlib.wrap b/meson/test cases/common/153 wrap file should not failed/subprojects/zlib.wrap
new file mode 100644
index 000000000..6d5896f79
--- /dev/null
+++ b/meson/test cases/common/153 wrap file should not failed/subprojects/zlib.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+directory = zlib-1.2.8
+
+source_url = http://zlib.net/fossils/zlib-1.2.8.tar.gz
+source_filename = zlib-1.2.8.tar.gz
+source_hash = 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.8/8/get_zip
+patch_filename = zlib-1.2.8-8-wrap.zip
+patch_hash = 17c52a0e0c59ce926d3959005d5cd8178c6c7e2c9a4a1304279a8320c955ac60