aboutsummaryrefslogtreecommitdiff
path: root/manual tests
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-03-20 15:45:32 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-03-20 15:51:04 +0200
commit29fa1dd52289ea3141c251f66b70bf660c7724e1 (patch)
treee0dd85f14047939bc37510e1210217df1cda678b /manual tests
parentdf357211a81a63919c64336ce7e4cc373a744e74 (diff)
downloadmeson-29fa1dd52289ea3141c251f66b70bf660c7724e1.zip
meson-29fa1dd52289ea3141c251f66b70bf660c7724e1.tar.gz
meson-29fa1dd52289ea3141c251f66b70bf660c7724e1.tar.bz2
Add support for checking out git repos to subprojects automatically.
Diffstat (limited to 'manual tests')
-rw-r--r--manual tests/1 wrap/subprojects/sqlite.wrap2
-rw-r--r--manual tests/2 multiwrap/subprojects/libpng.wrap3
-rw-r--r--manual tests/2 multiwrap/subprojects/lua.wrap2
-rw-r--r--manual tests/2 multiwrap/subprojects/zlib.wrap2
-rw-r--r--manual tests/3 git wrap/meson.build8
-rw-r--r--manual tests/3 git wrap/prog.c6
-rw-r--r--manual tests/3 git wrap/subprojects/samplesubproject.wrap4
-rw-r--r--manual tests/4 standalone binaries/Info.plist (renamed from manual tests/3 standalone binaries/Info.plist)0
-rwxr-xr-xmanual tests/4 standalone binaries/build_linux_package.sh (renamed from manual tests/3 standalone binaries/build_linux_package.sh)0
-rwxr-xr-xmanual tests/4 standalone binaries/build_osx_package.sh (renamed from manual tests/3 standalone binaries/build_osx_package.sh)0
-rwxr-xr-xmanual tests/4 standalone binaries/linux_bundler.sh (renamed from manual tests/3 standalone binaries/linux_bundler.sh)0
-rw-r--r--manual tests/4 standalone binaries/meson.build (renamed from manual tests/3 standalone binaries/meson.build)0
-rw-r--r--manual tests/4 standalone binaries/myapp.cpp (renamed from manual tests/3 standalone binaries/myapp.cpp)0
-rw-r--r--manual tests/4 standalone binaries/myapp.icns (renamed from manual tests/3 standalone binaries/myapp.icns)bin1831 -> 1831 bytes
-rwxr-xr-xmanual tests/4 standalone binaries/myapp.sh (renamed from manual tests/3 standalone binaries/myapp.sh)0
-rwxr-xr-xmanual tests/4 standalone binaries/osx_bundler.sh (renamed from manual tests/3 standalone binaries/osx_bundler.sh)0
-rw-r--r--manual tests/4 standalone binaries/readme.txt (renamed from manual tests/3 standalone binaries/readme.txt)0
-rw-r--r--manual tests/4 standalone binaries/template.dmg.gz (renamed from manual tests/3 standalone binaries/template.dmg.gz)bin37311 -> 37311 bytes
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 879a170..b56e7e2 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 bd65080..d7cb93e 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 da2ca14..8f19d15 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 7ea3354..37202f8 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 0000000..f3cce00
--- /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 0000000..df38000
--- /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 0000000..f52190b
--- /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 0f0c90e..0f0c90e 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 806a453..806a453 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 eca11c6..eca11c6 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 a0e5c12..a0e5c12 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 e5e6ee0..e5e6ee0 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 c57fd04..c57fd04 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 6331954..6331954 100644
--- a/manual tests/3 standalone binaries/myapp.icns
+++ b/manual tests/4 standalone binaries/myapp.icns
Binary files differ
diff --git a/manual tests/3 standalone binaries/myapp.sh b/manual tests/4 standalone binaries/myapp.sh
index 3191483..3191483 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 f61187f..f61187f 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 6b26c49..6b26c49 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 fcb6d61..fcb6d61 100644
--- a/manual tests/3 standalone binaries/template.dmg.gz
+++ b/manual tests/4 standalone binaries/template.dmg.gz
Binary files differ