Skip to content

Commit 2f669af

Browse files
committed
build: update meson
1 parent 66a36d3 commit 2f669af

File tree

4 files changed

+4
-27
lines changed

4 files changed

+4
-27
lines changed

extension/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ description = custom_target(
3131
'description',
3232
input: description_in,
3333
output: 'description.xml',
34-
command: [ i18n_script, meson.source_root(), meson.build_root() ],
34+
command: [ i18n_script, meson.project_source_root(), meson.project_build_root() ],
3535
install: bundled,
3636
install_dir: extension_dir,
3737
)

meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('parlatype-libreoffice-extension',
22
version: '3.1.1',
3-
#meson_version: '>= 0.47.2', # oldest working tested version
3+
meson_version: '>= 0.56.0',
44
license: 'GPL3+',
55
)
66

@@ -28,7 +28,7 @@ if not bundled
2828
zip = find_program('zip', required: true)
2929
custom_target(
3030
'oxt',
31-
command: [ oxt, meson.source_root(), meson.build_root() ],
31+
command: [ oxt, meson.project_source_root(), meson.project_build_root() ],
3232
output: [ 'Parlatype.oxt' ],
3333
depends: [ description, options_dialog, toolbar, window_state ],
3434
build_by_default: true

po/install_mo_locally.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

po/meson.build

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
i18n.gettext(
22
'parlatype_lo',
33
data_dirs: [ '.' ],
4-
install: false
5-
# requires meson >= 0.50
6-
# install_dir: join_paths(extension_dir, 'locale')
4+
install_dir: join_paths(extension_dir, 'locale')
75
)
86

9-
run_command('install_mo_locally.sh')
10-
117
if bundled
128
install_subdir(
139
join_paths(meson.current_build_dir(), 'locale'),

0 commit comments

Comments
 (0)