lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Drop join_paths() in favor of /

Browse source
This commit is contained in:
Christopher Davis 2022-08-05 00:21:23 -04:00
parent 8fd63ab9b7
commit d443107146
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
data/icons/meson.build
View file

@ -1,19 +1,19 @@
scalable_dir = join_paths('hicolor', 'scalable', 'apps') scalable_dir = 'hicolor' / 'scalable' / 'apps'
install_data( install_data(
join_paths(scalable_dir, 'org.gnome.Loupe.svg'), scalable_dir / 'org.gnome.Loupe.svg',
install_dir: join_paths(iv_datadir, 'icons', scalable_dir), install_dir: iv_datadir / 'icons' / scalable_dir,
) )
install_data( install_data(
join_paths(scalable_dir, 'org.gnome.Loupe.Devel.svg'), scalable_dir / 'org.gnome.Loupe.Devel.svg',
install_dir: join_paths(iv_datadir, 'icons', scalable_dir), install_dir: iv_datadir / 'icons' / scalable_dir,
) )
symbolic_dir = join_paths('hicolor', 'symbolic', 'apps') symbolic_dir = 'hicolor' / 'symbolic' / 'apps'
install_data( install_data(
join_paths(symbolic_dir, 'org.gnome.Loupe-symbolic.svg'), symbolic_dir / 'org.gnome.Loupe-symbolic.svg',
install_dir: join_paths(iv_datadir, 'icons', symbolic_dir), install_dir: iv_datadir / 'icons' / symbolic_dir,
rename: '@0@-symbolic.svg'.format(app_id) rename: '@0@-symbolic.svg'.format(app_id)
) )

8
data/meson.build
View file

@ -8,7 +8,7 @@ desktop_file = i18n.merge_file(
type: 'desktop', type: 'desktop',
po_dir: '../po', po_dir: '../po',
install: true, install: true,
install_dir: join_paths(iv_datadir, 'applications') install_dir: iv_datadir / 'applications'
) )
configure_file( configure_file(
@ -16,7 +16,7 @@ configure_file(
output: '@0@.service'.format(app_id), output: '@0@.service'.format(app_id),
configuration: conf, configuration: conf,
install: true, install: true,
install_dir: join_paths(iv_datadir, 'dbus-1', 'services') install_dir: iv_datadir / 'dbus-1' / 'services'
) )
desktop_utils = find_program('desktop-file-validate', required: false) desktop_utils = find_program('desktop-file-validate', required: false)
@ -35,7 +35,7 @@ appstream_file = i18n.merge_file(
output: '@0@.appdata.xml'.format(app_id), output: '@0@.appdata.xml'.format(app_id),
po_dir: '../po', po_dir: '../po',
install: true, install: true,
install_dir: join_paths(iv_datadir, 'appdata') install_dir: iv_datadir / 'appdata'
) )
# appstream_util = find_program('appstream-util', required: false) # appstream_util = find_program('appstream-util', required: false)
@ -46,7 +46,7 @@ appstream_file = i18n.merge_file(
# endif # endif
install_data('org.gnome.Loupe.gschema.xml', install_data('org.gnome.Loupe.gschema.xml',
install_dir: join_paths(iv_datadir, 'glib-2.0', 'schemas') install_dir: iv_datadir / 'glib-2.0' / 'schemas'
) )
compile_schemas = find_program('glib-compile-schemas', required: false) compile_schemas = find_program('glib-compile-schemas', required: false)

8
meson.build
View file

@ -14,10 +14,10 @@ dependency('libadwaita-1')
cargo = find_program('cargo', required: true) cargo = find_program('cargo', required: true)
iv_prefix = get_option('prefix') iv_prefix = get_option('prefix')
iv_bindir = join_paths(iv_prefix, get_option('bindir')) iv_bindir = iv_prefix / get_option('bindir')
iv_localedir = join_paths(iv_prefix, get_option('localedir')) iv_localedir = iv_prefix / get_option('localedir')
iv_datadir = join_paths(iv_prefix, get_option('datadir')) iv_datadir = iv_prefix / get_option('datadir')
iv_pkgdatadir = join_paths(iv_datadir, meson.project_name()) iv_pkgdatadir = iv_datadir / meson.project_name()
profile = '' profile = ''
name_suffix = '' name_suffix = ''

4
src/meson.build
View file

@ -7,8 +7,8 @@ configure_file(
# Copy the config.rs output to the source directory. # Copy the config.rs output to the source directory.
run_command( run_command(
'cp', 'cp',
join_paths(meson.build_root(), 'src', 'config.rs'), meson.build_root() / 'src' / 'config.rs',
join_paths(meson.source_root(), 'src', 'config.rs'), meson.source_root() / 'src' / 'config.rs',
check: true check: true
) )