From c7205a135dc3a68f866d115425a6543bae7d00f0 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 1 Sep 2017 13:29:14 -0300 Subject: [PATCH] Do not use glue for GIO --- gio/generated/generate_code.py | 6 +++--- gio/generated/meson.build | 2 -- gio/meson.build | 12 ------------ sample/opaquetest/Makefile.am | 2 +- sample/valtest/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/gio/generated/generate_code.py b/gio/generated/generate_code.py index a238e22c4..12168fe8c 100644 --- a/gio/generated/generate_code.py +++ b/gio/generated/generate_code.py @@ -14,9 +14,9 @@ if __name__ == "__main__": parser.add_argument("--gapi-fixup") parser.add_argument("--metadata") parser.add_argument("--gapi-codegen") - parser.add_argument("--glue-file") - parser.add_argument("--glue-includes") - parser.add_argument("--glue-libname") + parser.add_argument("--glue-file", default="") + parser.add_argument("--glue-includes", default="") + parser.add_argument("--glue-libname", default="") parser.add_argument("--assembly-name") parser.add_argument("--extra-includes", action='append', default=[]) parser.add_argument("--out") diff --git a/gio/generated/meson.build b/gio/generated/meson.build index ac11d50be..5353498f0 100644 --- a/gio/generated/meson.build +++ b/gio/generated/meson.build @@ -403,8 +403,6 @@ source_gen = custom_target('gio_generated', '--metadata', metadata_fname, '--gapi-codegen', gapi_codegen.full_path(), '--extra-includes', glib_api_includes, - '--glue-file', gluefile, - '--glue-includes', glueincludes, '--out', meson.current_build_dir(), '--files', ';'.join(generated_sources), '--assembly-name', assembly_name, diff --git a/gio/meson.build b/gio/meson.build index 520334373..d6ce7c437 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -4,8 +4,6 @@ assembly_name = pkg + '-sharp' raw_api_fname = join_paths(meson.current_source_dir(), pkg + '-api.raw') metadata_fname = join_paths(meson.current_source_dir(), 'Gio.metadata') -glueincludes = 'gio/gio.h' -gluefile = join_paths(meson.current_build_dir(), 'generate.c') configure_file(input: assembly_name + '.dll.config.in', output: assembly_name + '.dll.config', @@ -38,15 +36,5 @@ gio_sharp = library(assembly_name, source_gen, sources, install_dir: lib_install_dir ) -gluegen = custom_target('giogluegen', - input: raw_api_fname, - output: 'generate.c', - command: [generate_api, '--fakeglue'], - depends: [source_gen]) - -gio_glue = library('giosharpglue-3', gluegen, - dependencies: [glib_dep, gio_dep], - install: install) - install_infos += [assembly_name, gio_sharp.full_path()] gio_sharp_dep = declare_dependency(link_with: [glib_sharp, gio_sharp]) diff --git a/sample/opaquetest/Makefile.am b/sample/opaquetest/Makefile.am index 5f8a40a4c..3f1ee1aba 100644 --- a/sample/opaquetest/Makefile.am +++ b/sample/opaquetest/Makefile.am @@ -5,7 +5,7 @@ assemblies=../../glib/glib-sharp.dll ../../gio/gio-sharp.dll ../../pango/pango-s references=$(addprefix -r:, $(assemblies)) opaquetest.exe: generated-stamp OpaqueTest.cs $(assemblies) - $(CSC) $(CSFLAGS) -out:opaquetest.exe $(references) $(srcdir)/OpaqueTest.cs $(GENERATED_SOURCES_OPTION) + $(CSC) $(CSFLAGS) -unsafe -out:opaquetest.exe $(references) $(srcdir)/OpaqueTest.cs $(GENERATED_SOURCES_OPTION) libopaque_la_SOURCES = \ opaques.c \ diff --git a/sample/valtest/Makefile.am b/sample/valtest/Makefile.am index e910f46f2..2a3de508b 100644 --- a/sample/valtest/Makefile.am +++ b/sample/valtest/Makefile.am @@ -5,7 +5,7 @@ assemblies=../../glib/glib-sharp.dll ../../gio/gio-sharp.dll ../../cairo/cairo-s references=$(addprefix -r:, $(assemblies)) valtest.exe: generated-stamp Valtest.cs $(assemblies) - $(CSC) $(CSFLAGS) -out:valtest.exe $(references) $(srcdir)/Valtest.cs $(GENERATED_SOURCES_OPTION) + $(CSC) $(CSFLAGS) -unsafe -out:valtest.exe $(references) $(srcdir)/Valtest.cs $(GENERATED_SOURCES_OPTION) libvalobj_la_SOURCES = \ valobj.c \