diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-13 17:33:43 +0100 |
---|---|---|
committer | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-13 17:40:36 +0100 |
commit | 284b4c828a84a776233fc21438640d974c52394d (patch) | |
tree | f16138daeaaba7ad028a19b99f5d94804c6006d1 /gir | |
parent | f2dca4e6a796560944b2ef8c158f6cc247f2ae5d (diff) | |
download | gobject-introspection-284b4c828a84a776233fc21438640d974c52394d.tar.gz |
meson: address review comments
See here:
https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/64
Particularly, options are renamed to make it more readable and clear.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Diffstat (limited to 'gir')
-rw-r--r-- | gir/meson.build | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/gir/meson.build b/gir/meson.build index a0280330..4ee224c7 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -41,29 +41,25 @@ gir_files = [ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') install_data(gir_files, install_dir: girdir) -if get_option('enable-host-gi') +if get_option('cross_use_host_gi') scanner_command = [ 'g-ir-scanner', - '--output=@OUTPUT@', - '--no-libtool', - '--quiet', - '--reparse-validate', - '--add-include-path', join_paths(meson.current_build_dir()), - '--add-include-path', join_paths(meson.current_source_dir()), ] else scanner_command = [ python, girscanner, + ] +endif + +scanner_command += [ '--output=@OUTPUT@', '--no-libtool', '--quiet', '--reparse-validate', '--add-include-path', join_paths(meson.current_build_dir()), '--add-include-path', join_paths(meson.current_source_dir()), - ] -endif - +] dep_type = glib_dep.type_name() if dep_type == 'internal' @@ -76,11 +72,11 @@ if dep_type == 'internal' '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] endif -if get_option('enable-gi-cross-wrapper') != '' - scanner_command += ['--use-binary-wrapper=' + get_option('enable-gi-cross-wrapper')] +if get_option('cross_gi_binary_wrapper') != '' + scanner_command += ['--use-binary-wrapper=' + get_option('cross_gi_binary_wrapper')] endif -if get_option('enable-gi-ldd-wrapper') != '' - scanner_command += ['--use-ldd-wrapper=' + get_option('enable-gi-ldd-wrapper')] +if get_option('cross_gi_ldd_wrapper') != '' + scanner_command += ['--use-ldd-wrapper=' + get_option('cross_gi_ldd_wrapper')] endif # Take a glob and print to newlines globber = ''' @@ -108,8 +104,8 @@ glib_command = scanner_command + [ if dep_type == 'pkgconfig' glib_command += ['--external-library', '--pkg=glib-2.0'] - glib_libdir = get_option('pkgconfig-sysroot-path') + glib_dep.get_pkgconfig_variable('libdir') - glib_incdir = get_option('pkgconfig-sysroot-path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0') + glib_libdir = get_option('cross_pkgconfig_sysroot_path') + glib_dep.get_pkgconfig_variable('libdir') + glib_incdir = get_option('cross_pkgconfig_sysroot_path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0') glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') glib_files += join_paths(glib_libincdir, 'glibconfig.h') @@ -364,7 +360,7 @@ if giounix_dep.found() dep_type = giounix_dep.type_name() if dep_type == 'pkgconfig' gio_command += ['--pkg=gio-unix-2.0'] - giounix_includedir = get_option('pkgconfig-sysroot-path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0') + giounix_includedir = get_option('cross_pkgconfig_sysroot_path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0') # Get the installed gio-unix header list ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) if ret.returncode() != 0 @@ -447,17 +443,16 @@ gir_files += custom_target('gir-girepository', ) typelibs = [] -if get_option('enable-gi-cross-wrapper') != '' - gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@', - '--includedir', meson.current_build_dir(), - '--includedir', meson.current_source_dir(), - ] +if get_option('cross_gi_binary_wrapper') != '' + gircompiler_command = [get_option('cross_gi_binary_wrapper'), gircompiler.full_path(), ] else - gircompiler_command = [gircompiler, '-o', '@OUTPUT@', '@INPUT@', + gircompiler_command = [gircompiler, ] +endif + +gircompiler_command += [ '-o', '@OUTPUT@', '@INPUT@', '--includedir', meson.current_build_dir(), '--includedir', meson.current_source_dir(), - ] -endif +] foreach gir : gir_files typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), |