Skip to content

Commit 6adaef6

Browse files
committed
build: Use / instead of join_paths
Since meson 0.49, the `/` character can be used to join paths[0], so all the instances of `join_paths` have been replaced. [0] http://mesonbuild.com/Release-notes-for-0-49-0.html#joining-paths-with-
1 parent c6445f1 commit 6adaef6

3 files changed

Lines changed: 24 additions & 24 deletions

File tree

data/meson.build

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Install man page
33
install_data(
44
'meld.1',
5-
install_dir: join_paths(mandir, 'man1')
5+
install_dir: mandir / 'man1'
66
)
77

88
# Install schema file
@@ -70,7 +70,7 @@ endif
7070

7171
# Install mimetypes
7272
mimetype_file = i18n.merge_file(
73-
input: join_paths('mime', '@0@.xml.in'.format(resource_base_id)),
73+
input: 'mime' / '@0@.xml.in'.format(resource_base_id),
7474
output: '@0@.xml'.format(application_id),
7575
po_dir: podir,
7676
data_dirs: itsdir,
@@ -96,12 +96,12 @@ styles = [
9696

9797
foreach style : styles
9898
i18n.merge_file(
99-
input: join_paths('styles', style + '.in'),
99+
input: 'styles' / style + '.in',
100100
output: style,
101101
po_dir: podir,
102102
data_dirs: itsdir,
103103
install: true,
104-
install_dir: join_paths(pkgdatadir, 'styles')
104+
install_dir: pkgdatadir / 'styles',
105105
)
106106
endforeach
107107

@@ -110,15 +110,15 @@ icon_sizes = ['scalable']
110110

111111
foreach i : icon_sizes
112112
install_data(
113-
join_paths('icons/hicolor', i , 'apps', application_id + '.svg'),
114-
install_dir: join_paths(icondir, 'hicolor', i , 'apps'),
113+
'icons/hicolor' / i / 'apps' / application_id + '.svg',
114+
install_dir: icondir / 'hicolor' / i / 'apps',
115115
rename: '@0@.svg'.format(application_id)
116116
)
117117
endforeach
118118

119119
# Install the symbolic icon
120120
install_data(
121-
join_paths('icons/hicolor/symbolic/apps', application_id_no_profile + '-symbolic.svg'),
122-
install_dir: join_paths(icondir, 'hicolor', 'symbolic', 'apps'),
121+
'icons/hicolor/symbolic/apps' / application_id_no_profile + '-symbolic.svg',
122+
install_dir: icondir / 'hicolor/symbolic/apps',
123123
rename: '@0@-symbolic.svg'.format(application_id)
124124
)

meld/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ folders = {
7878
}
7979

8080
foreach folder_name, sources : folders
81-
pkgdir = join_paths(meson.project_name(), folder_name)
81+
pkgdir = meson.project_name() / folder_name
8282
python3.install_sources(sources, pure: true, subdir: pkgdir)
8383
endforeach
8484

meson.build

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ application_id = 'org.gnome.Meld@0@'.format(profile)
3232

3333
prefix = get_option('prefix')
3434

35-
bindir = join_paths(prefix, get_option('bindir'))
36-
datadir = join_paths(prefix, get_option('datadir'))
37-
libexecdir = join_paths(prefix, get_option('libexecdir'))
38-
localedir = join_paths(prefix, get_option('localedir'))
39-
mandir = join_paths(prefix, get_option('mandir'))
40-
41-
appdatadir = join_paths(datadir, 'metainfo')
42-
desktopdir = join_paths(datadir, 'applications')
43-
icondir = join_paths(datadir, 'icons')
44-
mimedatadir = join_paths(datadir, 'mime', 'packages')
45-
pkgdatadir = join_paths(datadir, meson.project_name())
46-
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
47-
48-
itsdir = join_paths(meson.current_source_dir(), 'gettext')
49-
podir = join_paths(meson.current_source_dir(), 'po')
35+
bindir = prefix / get_option('bindir')
36+
datadir = prefix / get_option('datadir')
37+
libexecdir = prefix / get_option('libexecdir')
38+
localedir = prefix / get_option('localedir')
39+
mandir = prefix / get_option('mandir')
40+
41+
appdatadir = datadir / 'metainfo'
42+
desktopdir = datadir / 'applications'
43+
icondir = datadir / 'icons'
44+
mimedatadir = datadir / 'mime/packages'
45+
pkgdatadir = datadir / meson.project_name()
46+
schemadir = datadir / 'glib-2.0/schemas'
47+
48+
itsdir = meson.current_source_dir() / 'gettext'
49+
podir = meson.current_source_dir() / 'po'
5050

5151
subdir('meld')
5252
subdir('data')

0 commit comments

Comments
 (0)