Added gobject-introspection to gnome module.

10 files changed, 31 insertions, 47 deletions

diff --git a/test cases/frameworks/10 gresource/meson.build b/test cases/frameworks/10 gresource/meson.build
deleted file mode 100644
index 2084bf94e..000000000
--- a/test cases/frameworks/10 gresource/meson.build
+++ /dev/null
@@ -1,12 +0,0 @@
-project('glib compile resource', 'c')
-
-gnome = import('gnome')
-gio = dependency('gio-2.0')
-
-myres = gnome.compile_resources('myresources', 'myresource.gresource.xml',
-source_dir : 'data',
-c_name : 'myres')
-
-exe = executable('resprog', 'main.c', myres,
-dependencies : gio)
-test('resource test', exe)
diff --git a/test cases/frameworks/7 gir/meson.build b/test cases/frameworks/7 gir/meson.build
deleted file mode 100644
index 406273289..000000000
--- a/test cases/frameworks/7 gir/meson.build
+++ /dev/null
@@ -1,35 +0,0 @@
-project('gobject-introspection', 'c')
-
-glib = dependency('glib-2.0')
-gobj = dependency('gobject-2.0')
-gir = dependency('gobject-introspection-1.0')
-gmod = dependency('gmodule-2.0')
-
-girscan = find_program('g-ir-scanner')
-girc = find_program('g-ir-compiler')
-
-libsources = ['golib.c', 'golib.h']
-
-exe = executable('goprog', libsources, 'prog.c',
-dependencies : [glib, gobj, gir, gmod])
-
-test('gobjtest', exe)
-
-# Let's create Gir data with custom targets to prove that
-# Meson's syntax is expressive enough.
-r = run_command('pkg-config', '--cflags', 'gobject-introspection-1.0')
-custom_gir_args = r.stdout().strip().split()
-
-golibgir = custom_target('golibgir',
-  output : 'Meson-1.0.gir',
-  input : libsources,
-  command : [girscan, '@INPUT@', '--program', exe, custom_gir_args, '--include=GObject-2.0',
-  '--namespace=Meson', '--nsversion=1.0', '--output', '@OUTPUT@'],
-)
-
-custom_target('golibtypelib',
-  output : 'Meson-1.0.typelib',
-  command : [girc, golibgir,'--output', '@OUTPUT@'],
-  install : true,
-  install_dir : 'typelibdir'
-)
diff --git a/test cases/frameworks/10 gresource/data/res1.txt b/test cases/frameworks/7 gnome/data/res1.txt
index e10afea83..e10afea83 100644
--- a/test cases/frameworks/10 gresource/data/res1.txt
+++ b/test cases/frameworks/7 gnome/data/res1.txt
diff --git a/test cases/frameworks/7 gir/golib.c b/test cases/frameworks/7 gnome/golib.c
index 8d70649e3..8d70649e3 100644
--- a/test cases/frameworks/7 gir/golib.c
+++ b/test cases/frameworks/7 gnome/golib.c
diff --git a/test cases/frameworks/7 gir/golib.h b/test cases/frameworks/7 gnome/golib.h
index 40bf901dd..40bf901dd 100644
--- a/test cases/frameworks/7 gir/golib.h
+++ b/test cases/frameworks/7 gnome/golib.h
diff --git a/test cases/frameworks/7 gir/installed_files.txt b/test cases/frameworks/7 gnome/installed_files.txt
index beb8cba31..beb8cba31 100644
--- a/test cases/frameworks/7 gir/installed_files.txt
+++ b/test cases/frameworks/7 gnome/installed_files.txt
diff --git a/test cases/frameworks/10 gresource/main.c b/test cases/frameworks/7 gnome/main.c
index 471f07e47..471f07e47 100644
--- a/test cases/frameworks/10 gresource/main.c
+++ b/test cases/frameworks/7 gnome/main.c
diff --git a/test cases/frameworks/7 gnome/meson.build b/test cases/frameworks/7 gnome/meson.build
new file mode 100644
index 000000000..4341b78d4
--- /dev/null
+++ b/test cases/frameworks/7 gnome/meson.build
@@ -0,0 +1,31 @@
+project('gobject-introspection', 'c')
+
+gnome = import('gnome')
+gio = dependency('gio-2.0')
+glib = dependency('glib-2.0')
+gobj = dependency('gobject-2.0')
+gir = dependency('gobject-introspection-1.0')
+gmod = dependency('gmodule-2.0')
+
+myres = gnome.compile_resources('myresources', 'myresource.gresource.xml',
+source_dir : 'data',
+c_name : 'myres')
+
+resexe = executable('resprog', 'main.c', myres,
+dependencies : gio)
+test('resource test', resexe)
+
+libsources = ['golib.c', 'golib.h']
+
+girexe = executable('girprog', libsources, 'prog.c',
+dependencies : [glib, gobj, gir, gmod])
+
+gnome.generate_gir(girexe,
+sources : libsources,
+nsversion : '1.0',
+namespace : 'Meson',
+install : true,
+install_dir : 'typelibdir',
+)
+
+test('gobject introspection', girexe)
diff --git a/test cases/frameworks/10 gresource/myresource.gresource.xml b/test cases/frameworks/7 gnome/myresource.gresource.xml
index b44c8798b..b44c8798b 100644
--- a/test cases/frameworks/10 gresource/myresource.gresource.xml
+++ b/test cases/frameworks/7 gnome/myresource.gresource.xml
diff --git a/test cases/frameworks/7 gir/prog.c b/test cases/frameworks/7 gnome/prog.c
index 71584d6f2..71584d6f2 100644
--- a/test cases/frameworks/7 gir/prog.c
+++ b/test cases/frameworks/7 gnome/prog.c