Skip to content

Commit e4f9b5a

Browse files
committed
build: Modernize post-install.
- bump meson version. - Use gnome.post_install() instead of install scripts. Remove script dir. - Clean up dead (and now warning) install_subdir() calls.
1 parent b4e602c commit e4f9b5a

6 files changed

Lines changed: 9 additions & 61 deletions

File tree

files/meson.build

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
message('Copying ./files structure')
22

3-
install_subdir('usr/share/gtksourceview-2.0',
4-
install_dir: get_option('datadir'),
5-
)
6-
7-
install_subdir('usr/share/gtksourceview-3.0',
8-
install_dir: get_option('datadir'),
9-
)
10-
113
install_subdir('usr/share/nemo',
124
install_dir: get_option('datadir'),
135
)

install-scripts/meson.build

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

install-scripts/meson_install_schemas.py

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

install-scripts/meson_update_icon_cache.py

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

install-scripts/meson_update_mime_database.py

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

meson.build

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Meson build file
22

33
# https://github.com/linuxmint/nemo
4-
project('nemo', 'c', version : '6.7.2', meson_version : '>=0.56.0')
4+
project('nemo', 'c', version : '6.7.2', meson_version : '>=0.64.0')
55

66
# 1. If the library code has changed at all since last release, then increment revision.
77
# 2. If any interfaces have been added, then increment current and set revision to 0.
@@ -182,7 +182,6 @@ nemo_definitions = [
182182

183183
po_subdir = join_paths(meson.project_source_root(), 'po')
184184

185-
subdir('install-scripts')
186185
subdir('cut-n-paste-code/libegg')
187186
subdir('data')
188187
subdir('eel')
@@ -197,6 +196,14 @@ subdir('test')
197196
subdir('docs')
198197
subdir('action-layout-editor')
199198

199+
# Post-installation actions. Skipped automatically when DESTDIR is set
200+
# (debian builds, etc.), since the package manager handles them.
201+
gnome.post_install(
202+
glib_compile_schemas: true,
203+
gtk_update_icon_cache: true,
204+
update_mime_database: true,
205+
)
206+
200207
message('\n'.join(['',
201208
' @0@-@1@'.format(meson.project_name(), meson.project_version()),
202209
'',

0 commit comments

Comments
 (0)