Merge branch 'master' into release-7.1.0

elementary · Jul 31, 2023 · 87039bf · 87039bf
2 parents 52597c1 + 6c7626d
commit 87039bf
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 59 deletions.
diff --git a/data/meson.build b/data/meson.build
@@ -16,16 +16,16 @@ endforeach
 install_data([
   'styles/elementary-dark.xml',
   'styles/elementary-light.xml',
-], install_dir: join_paths(get_option('datadir'), 'gtksourceview-4', 'styles'))
+], install_dir: get_option('datadir') / 'gtksourceview-4' / 'styles')
 
 install_data([
   'fonts/BuilderBlocks.ttf',
-], install_dir: join_paths(get_option('datadir'), meson.project_name(), 'fonts'))
+], install_dir: get_option('datadir') / meson.project_name() / 'fonts')
 
 install_data(
     'io.elementary.code.gschema.xml',
     'io.elementary.code.plugins.spell.gschema.xml',
-    install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
+    install_dir: get_option('prefix') / get_option('datadir') / 'glib-2.0' / 'schemas'
 )
 
 config_data = configuration_data()
@@ -47,16 +47,16 @@ desktop_in_file = configure_file(
 desktop_file = i18n.merge_file(
     input: desktop_in_file,
     output: 'io.elementary.code.desktop',
-    po_dir: join_paths(meson.source_root (), 'po', 'extra'),
+    po_dir: meson.project_source_root () / 'po' / 'extra',
     type: 'desktop',
-    install_dir: join_paths(get_option('datadir'), 'applications'),
+    install_dir: get_option('datadir') / 'applications',
     install: true
 )
 
 i18n.merge_file(
     input: 'code.metainfo.xml.in',
     output: meson.project_name() + '.metainfo.xml',
-    po_dir: meson.source_root() / 'po' / 'extra',
+    po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
     install_dir: get_option('datadir') / 'metainfo',
@@ -78,9 +78,9 @@ if get_option ('have_pkexec')
     i18n.merge_file(
         input: policy_in,
         output: meson.project_name() + '.policy',
-        po_dir: join_paths(meson.source_root (), 'po', 'extra'),
+        po_dir: meson.project_source_root () / 'po' / 'extra',
         install: true,
-        install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions'),
+        install_dir: get_option('datadir') / 'polkit-1' / 'actions',
     )
 endif
 

diff --git a/meson.build b/meson.build
@@ -1,6 +1,7 @@
 project(
     'io.elementary.code',
     'vala', 'c',
+    meson_version: '>= 0.58.0',
     version: '7.1.0'
 )
 
@@ -11,16 +12,16 @@ add_project_arguments([
 )
 
 add_project_arguments(
-    ['--vapidir', join_paths(meson.current_source_dir(), 'vapi')],
+    ['--vapidir', meson.project_source_root() / 'vapi'],
     language: 'vala'
 )
 
 if get_option('have_pkexec')
     add_project_arguments('--define=HAVE_PKEXEC', language: 'vala')
 endif
 
-libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name())
-pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
+libexecdir = get_option('prefix') / get_option('libexecdir') / meson.project_name()
+pluginsdir = get_option('prefix') / get_option('libdir') / meson.project_name() / 'plugins'
 
 gnome = import('gnome')
 i18n = import('i18n')
@@ -46,7 +47,7 @@ code_resources = gnome.compile_resources(
 )
 
 # We need libvala-X.XX library, but it changes depending on the version that is installed
-vala_version = run_command (meson.get_compiler('vala'), '--api-version').stdout().strip()
+vala_version = run_command (meson.get_compiler('vala'), '--api-version', check: true).stdout().strip()
 vala_dep = dependency('libvala-@0@'.format(vala_version))
 
 dependencies = [
@@ -81,4 +82,4 @@ if get_option('plugins')
 endif
 subdir('po')
 
-meson.add_install_script('meson/post_install.py')
+gnome.post_install(glib_compile_schemas: true)
diff --git a/meson/post_install.py b/meson/post_install.py
diff --git a/plugins/brackets-completion/meson.build b/plugins/brackets-completion/meson.build
@@ -13,7 +13,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -23,10 +23,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
diff --git a/plugins/detect-indent/meson.build b/plugins/detect-indent/meson.build
@@ -13,7 +13,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -23,10 +23,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
diff --git a/plugins/editorconfig/meson.build b/plugins/editorconfig/meson.build
@@ -15,7 +15,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -25,10 +25,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
diff --git a/plugins/highlight-word-selection/meson.build b/plugins/highlight-word-selection/meson.build
@@ -13,7 +13,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -23,10 +23,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
diff --git a/plugins/markdown-actions/meson.build b/plugins/markdown-actions/meson.build
@@ -13,7 +13,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -23,10 +23,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
diff --git a/plugins/pastebin/meson.build b/plugins/pastebin/meson.build
@@ -17,7 +17,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -27,10 +27,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
diff --git a/plugins/preserve-indent/meson.build b/plugins/preserve-indent/meson.build
@@ -13,7 +13,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -23,10 +23,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
@@ -16,7 +16,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -26,10 +26,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
diff --git a/plugins/vim-emulation/meson.build b/plugins/vim-emulation/meson.build
@@ -13,7 +13,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -23,10 +23,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
diff --git a/plugins/word-completion/meson.build b/plugins/word-completion/meson.build
@@ -16,7 +16,7 @@ shared_module(
     module_files,
     dependencies: module_deps,
     install: true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
 
 custom_target(module_name + '.plugin_merge',
@@ -26,10 +26,10 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + meson.project_source_root () / 'po' / 'plugins',
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],
     install : true,
-    install_dir: join_paths(pluginsdir, module_name),
+    install_dir: pluginsdir / module_name,
 )
diff --git a/po/extra/meson.build b/po/extra/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext('extra',
-    args: ['--directory='+meson.source_root()],
+    args: ['--directory='+meson.project_source_root()],
     install: false,
     preset: 'glib'
 )
diff --git a/po/meson.build b/po/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext(meson.project_name(),
-    args: ['--directory='+meson.source_root()],
+    args: ['--directory='+meson.project_source_root()],
     preset: 'glib'
 )
 subdir('extra')

diff --git a/po/plugins/meson.build b/po/plugins/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext('plugins',
-    args: ['--directory='+meson.source_root(),
+    args: ['--directory='+meson.project_source_root(),
            '--from-code=UTF-8',
            '--language=Desktop',
            '--keyword=',

diff --git a/src/meson.build b/src/meson.build
@@ -4,8 +4,8 @@ conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf_data.set_quoted('VERSION', meson.project_version())
 conf_data.set_quoted('PREFIX', get_option('prefix'))
 conf_data.set_quoted('PLUGINDIR', pluginsdir)
-conf_data.set_quoted('DATADIR', join_paths (get_option('prefix'), get_option('datadir')))
-conf_data.set_quoted('LOCALEDIR', join_paths (get_option('prefix'), get_option('localedir')))
+conf_data.set_quoted('DATADIR', get_option('prefix') / get_option('datadir'))
+conf_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
 conf_data.set_quoted('BRANCH', branch)
 
 config_header = configure_file(
@@ -89,7 +89,7 @@ pkg.generate(
     filebase: 'codecore'
 )
 
-install_data ('codecore.deps', install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi'))
+install_data ('codecore.deps', install_dir: get_option('prefix') / get_option('datadir') / 'vala' / 'vapi')
 
 codecore_dep = declare_dependency(
     link_with: codecore,