build: Add keyfile as project argument

And delay signing when using csc
This commit is contained in:
Thibault Saunier 2017-09-25 11:44:14 -03:00 committed by Harry
parent 2e03809ce8
commit 484a713442
8 changed files with 10 additions and 14 deletions

View file

@ -1,4 +1,3 @@
snk = join_paths(meson.current_source_dir(), '..', 'gtk-sharp.snk')
pkg = 'atk' pkg = 'atk'
assembly_name = pkg + '-sharp' assembly_name = pkg + '-sharp'
@ -23,7 +22,7 @@ sources = [
] ]
atk_sharp = library(assembly_name, source_gen, sources, assemblyinfo, atk_sharp = library(assembly_name, source_gen, sources, assemblyinfo,
cs_args: ['-unsafe', '-keyfile:' + snk], cs_args: ['-unsafe'],
link_with: glib_sharp, link_with: glib_sharp,
install: install, install: install,
install_dir: lib_install_dir install_dir: lib_install_dir

View file

@ -1,4 +1,3 @@
snk = join_paths(meson.current_source_dir(), 'mono.snk')
assembly_name = 'cairo-sharp' assembly_name = 'cairo-sharp'
raw_api_fname = join_paths(meson.current_source_dir(), 'cairo-api.raw') raw_api_fname = join_paths(meson.current_source_dir(), 'cairo-api.raw')
@ -62,7 +61,6 @@ sources = [
] ]
cairo_sharp = library(assembly_name, sources, assemblyinfo, cairo_sharp = library(assembly_name, sources, assemblyinfo,
cs_args: ['-keyfile:' + snk],
install: install, install: install,
install_dir: lib_install_dir install_dir: lib_install_dir
) )

View file

@ -1,4 +1,3 @@
snk = join_paths(meson.current_source_dir(), '..', 'gtk-sharp.snk')
pkg = 'gdk' pkg = 'gdk'
assembly_name = pkg + '-sharp' assembly_name = pkg + '-sharp'
symbols = join_paths(meson.current_source_dir(), 'gdk-symbols.xml') symbols = join_paths(meson.current_source_dir(), 'gdk-symbols.xml')
@ -65,7 +64,7 @@ sources = [
deps = [glib_sharp, pango_sharp, cairo_sharp, gio_sharp] deps = [glib_sharp, pango_sharp, cairo_sharp, gio_sharp]
gdk_sharp = library(assembly_name, source_gen, sources, assemblyinfo, gdk_sharp = library(assembly_name, source_gen, sources, assemblyinfo,
cs_args: ['-unsafe', '-keyfile:' + snk], cs_args: ['-unsafe'],
link_with: deps, link_with: deps,
install: install, install: install,
install_dir: lib_install_dir install_dir: lib_install_dir

View file

@ -1,4 +1,3 @@
snk = join_paths(meson.current_source_dir(), '..', 'gtk-sharp.snk')
pkg = 'gio' pkg = 'gio'
assembly_name = pkg + '-sharp' assembly_name = pkg + '-sharp'
@ -30,7 +29,7 @@ sources = [
] ]
gio_sharp = library(assembly_name, source_gen, sources, assemblyinfo, gio_sharp = library(assembly_name, source_gen, sources, assemblyinfo,
cs_args: ['-unsafe', '-keyfile:' + snk], cs_args: ['-unsafe'],
link_with: glib_sharp, link_with: glib_sharp,
install: install, install: install,
install_dir: lib_install_dir install_dir: lib_install_dir

View file

@ -1,4 +1,3 @@
snk = join_paths(meson.current_source_dir(), '..', 'gtk-sharp.snk')
assembly_name = 'glib-sharp' assembly_name = 'glib-sharp'
configure_file(input: 'glib-sharp.dll.config.in', configure_file(input: 'glib-sharp.dll.config.in',
@ -93,7 +92,7 @@ sources = [
glib_sharp = library(assembly_name, sources, assemblyinfo, glib_sharp = library(assembly_name, sources, assemblyinfo,
cs_args: ['-unsafe', '-keyfile:' + snk], cs_args: ['-unsafe'],
install: install, install: install,
install_dir: lib_install_dir install_dir: lib_install_dir
) )

View file

@ -1,4 +1,3 @@
snk = join_paths(meson.current_source_dir(), '..', 'gtk-sharp.snk')
pkg = 'gtk' pkg = 'gtk'
assembly_name = pkg + '-sharp' assembly_name = pkg + '-sharp'
symbols = join_paths(meson.current_source_dir(), pkg + '-symbols.xml') symbols = join_paths(meson.current_source_dir(), pkg + '-symbols.xml')
@ -135,7 +134,7 @@ sources = [
deps = [glib_sharp, pango_sharp, cairo_sharp, gio_sharp, atk_sharp, gdk_sharp] deps = [glib_sharp, pango_sharp, cairo_sharp, gio_sharp, atk_sharp, gdk_sharp]
gtk_sharp = library(assembly_name, source_gen, sources, assemblyinfo, gtk_sharp = library(assembly_name, source_gen, sources, assemblyinfo,
cs_args: ['-unsafe', '-keyfile:' + snk, '-nowarn:0618,0612,0169'], cs_args: ['-unsafe', '-nowarn:0618,0612,0169'],
link_with: deps, link_with: deps,
install: install, install: install,
install_dir: lib_install_dir install_dir: lib_install_dir

View file

@ -17,6 +17,7 @@ runtime = ''
if get_option('buildtype') == 'debug' or get_option('buildtype') == 'debugoptimized' if get_option('buildtype') == 'debug' or get_option('buildtype') == 'debugoptimized'
runtime_debug_flags=' --debug' runtime_debug_flags=' --debug'
endif endif
if csc.get_id() == 'mono' if csc.get_id() == 'mono'
if not csc.version().version_compare(mono_required_version) if not csc.version().version_compare(mono_required_version)
error('Mono required version @0@ not found (@1@)'.format( error('Mono required version @0@ not found (@1@)'.format(
@ -27,6 +28,9 @@ if csc.get_id() == 'mono'
if mono_runtime_dep.found() if mono_runtime_dep.found()
runtime = 'mono' + runtime_debug_flags runtime = 'mono' + runtime_debug_flags
endif endif
add_project_arguments('-keyfile:' + join_paths(meson.current_source_dir(), 'gtk-sharp.snk'),
languages: ['cs'])
endif endif
install = get_option('install') install = get_option('install')

View file

@ -1,4 +1,3 @@
snk = join_paths(meson.current_source_dir(), '..', 'gtk-sharp.snk')
pkg = 'pango' pkg = 'pango'
assembly_name = pkg + '-sharp' assembly_name = pkg + '-sharp'
raw_api_fname = join_paths(meson.current_source_dir(), pkg + '-api.raw') raw_api_fname = join_paths(meson.current_source_dir(), pkg + '-api.raw')
@ -59,7 +58,7 @@ sources = [
deps = [glib_sharp, cairo_sharp] deps = [glib_sharp, cairo_sharp]
pango_sharp = library(assembly_name, source_gen, sources, assemblyinfo, pango_sharp = library(assembly_name, source_gen, sources, assemblyinfo,
cs_args: ['-unsafe', '-keyfile:' + snk], cs_args: ['-unsafe'],
link_with: deps, link_with: deps,
install: install, install: install,
install_dir: lib_install_dir install_dir: lib_install_dir