Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 9f11c9e53d91b23113202b40500540242bcabdb0 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Thu, 28 Oct 2021 18:57:24 +0200 |
| 4 | Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 9 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 10 | MIME-Version: 1.0 |
| 11 | Content-Type: text/plain; charset=UTF-8 |
| 12 | Content-Transfer-Encoding: 8bit |
| 13 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 14 | Upstream-Status: Pending |
| 15 | |
| 16 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 17 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 18 | --- |
| 19 | js/dbusServices/meson.build | 2 +- |
| 20 | meson.build | 6 +++++- |
| 21 | meson_options.txt | 6 ++++++ |
| 22 | subprojects/extensions-app/js/meson.build | 2 +- |
| 23 | subprojects/extensions-app/meson.build | 7 ++++++- |
| 24 | subprojects/extensions-app/meson_options.txt | 6 ++++++ |
| 25 | 6 files changed, 25 insertions(+), 4 deletions(-) |
| 26 | |
| 27 | diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 28 | index 48b7f89..700b590 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 29 | --- a/js/dbusServices/meson.build |
| 30 | +++ b/js/dbusServices/meson.build |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 31 | @@ -22,7 +22,7 @@ foreach service, dir : dbus_services |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 32 | |
| 33 | serviceconf = configuration_data() |
| 34 | serviceconf.set('service', service) |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame] | 35 | - serviceconf.set('gjs', gjs.full_path()) |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 36 | + serviceconf.set('gjs', gjs) |
| 37 | serviceconf.set('pkgdatadir', pkgdatadir) |
| 38 | |
| 39 | configure_file( |
| 40 | diff --git a/meson.build b/meson.build |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 41 | index 252fb1e..250f722 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 42 | --- a/meson.build |
| 43 | +++ b/meson.build |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 44 | @@ -125,7 +125,11 @@ endif |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 45 | |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame] | 46 | mutter_typelibdir = mutter_dep.get_variable('typelibdir') |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 47 | python = find_program('python3') |
| 48 | -gjs = find_program('gjs') |
| 49 | +if get_option('gjs_path') == '' |
| 50 | + gjs = find_program('gjs') |
| 51 | +else |
| 52 | + gjs = get_option('gjs_path') |
| 53 | +endif |
| 54 | |
| 55 | cc = meson.get_compiler('c') |
| 56 | |
| 57 | diff --git a/meson_options.txt b/meson_options.txt |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 58 | index 46ca8e7..3e9a31f 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 59 | --- a/meson_options.txt |
| 60 | +++ b/meson_options.txt |
| 61 | @@ -45,3 +45,9 @@ option('soup2', |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 62 | value: false, |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 63 | description: 'Use Soup 2.4 instead of Soup 3. Must be in sync with libgweather' |
| 64 | ) |
| 65 | + |
| 66 | +option('gjs_path', |
| 67 | + type: 'string', |
| 68 | + value: '', |
| 69 | + description: 'Instead of searching gjs executable, configure path' |
| 70 | +) |
| 71 | diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame] | 72 | index ce2a776..8f7bba4 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 73 | --- a/subprojects/extensions-app/js/meson.build |
| 74 | +++ b/subprojects/extensions-app/js/meson.build |
| 75 | @@ -9,7 +9,7 @@ endif |
| 76 | launcherconf.set('prefix', prefix) |
| 77 | launcherconf.set('libdir', libdir) |
| 78 | launcherconf.set('pkgdatadir', pkgdatadir) |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame] | 79 | -launcherconf.set('gjs', gjs.full_path()) |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 80 | +launcherconf.set('gjs', gjs) |
| 81 | |
| 82 | configure_file( |
| 83 | input: prgname + '.in', |
| 84 | diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 85 | index 66a39e9..331dc1d 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 86 | --- a/subprojects/extensions-app/meson.build |
| 87 | +++ b/subprojects/extensions-app/meson.build |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 88 | @@ -46,7 +46,12 @@ localedir = join_paths(datadir, 'locale') |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 89 | metainfodir = join_paths(datadir, 'metainfo') |
| 90 | servicedir = join_paths(datadir, 'dbus-1', 'services') |
| 91 | |
| 92 | -gjs = find_program('gjs') |
| 93 | +if get_option('gjs_path') == '' |
| 94 | + gjs = find_program('gjs') |
| 95 | +else |
| 96 | + gjs = get_option('gjs_path') |
| 97 | +endif |
| 98 | + |
| 99 | appstream_util = find_program('appstream-util', required: false) |
| 100 | desktop_file_validate = find_program('desktop-file-validate', required: false) |
| 101 | |
| 102 | diff --git a/subprojects/extensions-app/meson_options.txt b/subprojects/extensions-app/meson_options.txt |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame] | 103 | index ca2eb41..2787785 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 104 | --- a/subprojects/extensions-app/meson_options.txt |
| 105 | +++ b/subprojects/extensions-app/meson_options.txt |
| 106 | @@ -10,3 +10,9 @@ option('profile', |
| 107 | ], |
| 108 | value: 'default' |
| 109 | ) |
| 110 | + |
| 111 | +option('gjs_path', |
| 112 | + type: 'string', |
| 113 | + value: '', |
| 114 | + description: 'Instead of searching gjs executable, configure path' |
| 115 | +) |