Add support for checking out git repos to subprojects automatically.

18 files changed, 22 insertions, 5 deletions

diff --git a/manual tests/1 wrap/subprojects/sqlite.wrap b/manual tests/1 wrap/subprojects/sqlite.wrap
index 879a170d6..b56e7e27d 100644
--- a/manual tests/1 wrap/subprojects/sqlite.wrap
+++ b/manual tests/1 wrap/subprojects/sqlite.wrap
@@ -1,4 +1,4 @@
-[mesonwrap]
+[wrap-file]
 directory = sqlite-amalgamation-3080802
 
 source_url = http://sqlite.com/2015/sqlite-amalgamation-3080802.zip
diff --git a/manual tests/2 multiwrap/subprojects/libpng.wrap b/manual tests/2 multiwrap/subprojects/libpng.wrap
index bd6508040..d7cb93e01 100644
--- a/manual tests/2 multiwrap/subprojects/libpng.wrap
+++ b/manual tests/2 multiwrap/subprojects/libpng.wrap
@@ -1,5 +1,4 @@
-[mesonwrap]
-
+[wrap-file]
 directory = libpng-1.6.16
 
 source_url = ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.16.tar.gz
diff --git a/manual tests/2 multiwrap/subprojects/lua.wrap b/manual tests/2 multiwrap/subprojects/lua.wrap
index da2ca1468..8f19d151f 100644
--- a/manual tests/2 multiwrap/subprojects/lua.wrap
+++ b/manual tests/2 multiwrap/subprojects/lua.wrap
@@ -1,4 +1,4 @@
-[mesonwrap]
+[wrap-file]
 directory = lua-5.3.0
 
 source_url = http://www.lua.org/ftp/lua-5.3.0.tar.gz
diff --git a/manual tests/2 multiwrap/subprojects/zlib.wrap b/manual tests/2 multiwrap/subprojects/zlib.wrap
index 7ea335428..37202f8d4 100644
--- a/manual tests/2 multiwrap/subprojects/zlib.wrap
+++ b/manual tests/2 multiwrap/subprojects/zlib.wrap
@@ -1,4 +1,4 @@
-[mesonwrap]
+[wrap-file]
 directory = zlib-1.2.8
 
 source_url = http://zlib.net/zlib-1.2.8.tar.gz
diff --git a/manual tests/3 git wrap/meson.build b/manual tests/3 git wrap/meson.build
new file mode 100644
index 000000000..f3cce0014
--- /dev/null
+++ b/manual tests/3 git wrap/meson.build
@@ -0,0 +1,8 @@
+project('git outcheckker', 'c')
+
+sp = subproject('samplesubproject')
+
+exe = executable('gitprog', 'prog.c',
+include_directories : sp.get_variable('subproj_inc'),
+link_with : sp.get_variable('subproj_lib'),
+)
diff --git a/manual tests/3 git wrap/prog.c b/manual tests/3 git wrap/prog.c
new file mode 100644
index 000000000..df38000ec
--- /dev/null
+++ b/manual tests/3 git wrap/prog.c
@@ -0,0 +1,6 @@
+#include"subproj.h"
+
+int main(int argc, char **argv) {
+    subproj_function();
+    return 0;
+}
diff --git a/manual tests/3 git wrap/subprojects/samplesubproject.wrap b/manual tests/3 git wrap/subprojects/samplesubproject.wrap
new file mode 100644
index 000000000..f52190b8f
--- /dev/null
+++ b/manual tests/3 git wrap/subprojects/samplesubproject.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=samplesubproject
+url=https://github.com/jpakkane/samplesubproject.git
+revision=head
diff --git a/manual tests/3 standalone binaries/Info.plist b/manual tests/4 standalone binaries/Info.plist
index 0f0c90e49..0f0c90e49 100644
--- a/manual tests/3 standalone binaries/Info.plist
+++ b/manual tests/4 standalone binaries/Info.plist
diff --git a/manual tests/3 standalone binaries/build_linux_package.sh b/manual tests/4 standalone binaries/build_linux_package.sh
index 806a453cb..806a453cb 100755
--- a/manual tests/3 standalone binaries/build_linux_package.sh
+++ b/manual tests/4 standalone binaries/build_linux_package.sh
diff --git a/manual tests/3 standalone binaries/build_osx_package.sh b/manual tests/4 standalone binaries/build_osx_package.sh
index eca11c635..eca11c635 100755
--- a/manual tests/3 standalone binaries/build_osx_package.sh
+++ b/manual tests/4 standalone binaries/build_osx_package.sh
diff --git a/manual tests/3 standalone binaries/linux_bundler.sh b/manual tests/4 standalone binaries/linux_bundler.sh
index a0e5c122f..a0e5c122f 100755
--- a/manual tests/3 standalone binaries/linux_bundler.sh
+++ b/manual tests/4 standalone binaries/linux_bundler.sh
diff --git a/manual tests/3 standalone binaries/meson.build b/manual tests/4 standalone binaries/meson.build
index e5e6ee06f..e5e6ee06f 100644
--- a/manual tests/3 standalone binaries/meson.build
+++ b/manual tests/4 standalone binaries/meson.build
diff --git a/manual tests/3 standalone binaries/myapp.cpp b/manual tests/4 standalone binaries/myapp.cpp
index c57fd04af..c57fd04af 100644
--- a/manual tests/3 standalone binaries/myapp.cpp
+++ b/manual tests/4 standalone binaries/myapp.cpp
diff --git a/manual tests/3 standalone binaries/myapp.icns b/manual tests/4 standalone binaries/myapp.icns
index 633195454..633195454 100644
--- a/manual tests/3 standalone binaries/myapp.icns
+++ b/manual tests/4 standalone binaries/myapp.icns
diff --git a/manual tests/3 standalone binaries/myapp.sh b/manual tests/4 standalone binaries/myapp.sh
index 319148353..319148353 100755
--- a/manual tests/3 standalone binaries/myapp.sh
+++ b/manual tests/4 standalone binaries/myapp.sh
diff --git a/manual tests/3 standalone binaries/osx_bundler.sh b/manual tests/4 standalone binaries/osx_bundler.sh
index f61187fc3..f61187fc3 100755
--- a/manual tests/3 standalone binaries/osx_bundler.sh
+++ b/manual tests/4 standalone binaries/osx_bundler.sh
diff --git a/manual tests/3 standalone binaries/readme.txt b/manual tests/4 standalone binaries/readme.txt
index 6b26c49ee..6b26c49ee 100644
--- a/manual tests/3 standalone binaries/readme.txt
+++ b/manual tests/4 standalone binaries/readme.txt
diff --git a/manual tests/3 standalone binaries/template.dmg.gz b/manual tests/4 standalone binaries/template.dmg.gz
index fcb6d6115..fcb6d6115 100644
--- a/manual tests/3 standalone binaries/template.dmg.gz
+++ b/manual tests/4 standalone binaries/template.dmg.gz