From f83212a24d7a7c074c57444f0235ad5c0815c5ec Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 1 Dec 2020 21:45:51 +0200 Subject: [PATCH] Allow extras installation: shells, WebExtension Add a new "install_extras" Meson build option which will enable installing extras chosen to be built. This covers the JSC shell, the GTK shell, and the WebExtension. --- gtkshell/meson.build | 1 + meson_options.txt | 5 +++++ shell/meson.build | 1 + wkext/meson.build | 5 +++++ 4 files changed, 12 insertions(+) diff --git a/gtkshell/meson.build b/gtkshell/meson.build index c0b5480..c545141 100644 --- a/gtkshell/meson.build +++ b/gtkshell/meson.build @@ -7,4 +7,5 @@ gtkshell_exe = executable('kn-gtk', webkitgtk_dep, libkn_dep, ], + install: get_option('install_extras'), ) diff --git a/meson_options.txt b/meson_options.txt index c0f784e..defd17c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -20,3 +20,8 @@ option('documentation', value: 'auto', description: 'Build reference documentation (needs HotDoc)' ) +option('install_extras', + type: 'boolean', + value: false, + description: 'Install built extras (JSC shell, GTK shell, WebExtension)' +) diff --git a/shell/meson.build b/shell/meson.build index 6d22e8d..91ea337 100644 --- a/shell/meson.build +++ b/shell/meson.build @@ -10,4 +10,5 @@ shell_exe = executable('kn-jsc', libkn_dep, javascriptcore_dep, ], + install: get_option('install_extras'), ) diff --git a/wkext/meson.build b/wkext/meson.build index 0bbf66c..22e9d6f 100644 --- a/wkext/meson.build +++ b/wkext/meson.build @@ -1,3 +1,6 @@ +wkext_install_dir = join_paths(get_option('libexecdir'), + 'kiln-@0@-@1@'.format(opt_webkit_port, api_version)) + wkext_module = shared_module('kiln-webkit-' + opt_webkit_port, 'extension.c', c_args: [ @@ -8,4 +11,6 @@ wkext_module = shared_module('kiln-webkit-' + opt_webkit_port, libkn_dep, webkit_extension_dep, ], + install: get_option('install_extras'), + install_dir: wkext_install_dir, ) -- 2.45.2