build: Replace join_paths by / operator
This commit is contained in:
@@ -9,5 +9,5 @@ appdata = i18n.merge_file(
|
||||
output: '@0@.appdata.xml'.format(application_id),
|
||||
po_dir: po_dir,
|
||||
install: true,
|
||||
install_dir: join_paths(calendar_datadir, 'metainfo')
|
||||
install_dir: calendar_datadir / 'metainfo'
|
||||
)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
install_subdir(
|
||||
'hicolor',
|
||||
install_dir: join_paths(calendar_datadir, 'icons')
|
||||
install_dir: calendar_datadir / 'icons'
|
||||
)
|
||||
|
||||
+4
-4
@@ -1,7 +1,7 @@
|
||||
subdir('icons')
|
||||
subdir('appdata')
|
||||
|
||||
enum_headers = files(join_paths(src_dir, 'gcal-enums.h'))
|
||||
enum_headers = files(src_dir / 'gcal-enums.h')
|
||||
|
||||
enums_xml = gnome.mkenums(
|
||||
'org.gnome.calendar.enums.xml',
|
||||
@@ -30,7 +30,7 @@ desktop = i18n.merge_file(
|
||||
output: '@0@.desktop'.format(application_id),
|
||||
po_dir: po_dir,
|
||||
install: true,
|
||||
install_dir: join_paths(calendar_datadir, 'applications')
|
||||
install_dir: calendar_datadir / 'applications'
|
||||
)
|
||||
|
||||
# GNOME Shell search provider
|
||||
@@ -40,7 +40,7 @@ search_provider_conf.set('profile', profile)
|
||||
configure_file(
|
||||
configuration: search_provider_conf,
|
||||
input: files('org.gnome.Calendar.search-provider.ini.in'),
|
||||
install_dir: join_paths(calendar_datadir, 'gnome-shell', 'search-providers'),
|
||||
install_dir: calendar_datadir / 'gnome-shell' / 'search-providers',
|
||||
output: '@0@.search-provider.ini'.format(application_id)
|
||||
)
|
||||
|
||||
@@ -79,7 +79,7 @@ configure_file(
|
||||
input: service + '.in',
|
||||
output: '@0@.service'.format(application_id),
|
||||
install: true,
|
||||
install_dir: join_paths(calendar_datadir, 'dbus-1', 'services'),
|
||||
install_dir: calendar_datadir / 'dbus-1' / 'services',
|
||||
configuration: service_conf
|
||||
)
|
||||
|
||||
|
||||
+9
-9
@@ -22,11 +22,11 @@ calendar_minor_version = version_array[1]
|
||||
#################
|
||||
|
||||
calendar_prefix = get_option('prefix')
|
||||
calendar_bindir = join_paths(calendar_prefix, get_option('bindir'))
|
||||
calendar_localedir = join_paths(calendar_prefix, get_option('localedir'))
|
||||
calendar_datadir = join_paths(calendar_prefix, get_option('datadir'))
|
||||
calendar_pkgdatadir = join_paths(calendar_datadir, meson.project_name())
|
||||
calendar_schemadir = join_paths(calendar_datadir, 'glib-2.0', 'schemas')
|
||||
calendar_bindir = calendar_prefix / get_option('bindir')
|
||||
calendar_localedir = calendar_prefix / get_option('localedir')
|
||||
calendar_datadir = calendar_prefix / get_option('datadir')
|
||||
calendar_pkgdatadir = calendar_datadir / meson.project_name()
|
||||
calendar_schemadir = calendar_datadir / 'glib-2.0' / 'schemas'
|
||||
|
||||
|
||||
###########
|
||||
@@ -129,7 +129,7 @@ common_flags = [
|
||||
'-DHAVE_CONFIG_H',
|
||||
'-DPACKAGE_LOCALE_DIR="@0@"'.format(calendar_localedir),
|
||||
'-DPACKAGE_DATA_DIR="@0@"'.format(calendar_pkgdatadir),
|
||||
'-DUI_DATA_DIR="@0@"'.format(join_paths(calendar_datadir), 'style'),
|
||||
'-DUI_DATA_DIR="@0@"'.format(calendar_datadir, 'style'),
|
||||
'-DEDS_DISABLE_DEPRECATED',
|
||||
'-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE'
|
||||
]
|
||||
@@ -178,9 +178,9 @@ pkg = import('pkgconfig')
|
||||
|
||||
top_inc = include_directories('.')
|
||||
|
||||
data_dir = join_paths(meson.source_root(), 'data')
|
||||
po_dir = join_paths(meson.source_root(), 'po')
|
||||
src_dir = join_paths(meson.source_root(), 'src')
|
||||
data_dir = meson.source_root() / 'data'
|
||||
po_dir = meson.source_root() / 'po'
|
||||
src_dir = meson.source_root() / 'src'
|
||||
|
||||
|
||||
###########
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
test_env = [
|
||||
'G_TEST_SRCDIR=' + meson.current_source_dir(),
|
||||
'G_TEST_BUILDDIR=' + meson.current_build_dir(),
|
||||
'GSETTINGS_SCHEMA_DIR=' + join_paths(meson.build_root(), 'data'),
|
||||
'GSETTINGS_SCHEMA_DIR=' + meson.build_root() / 'data',
|
||||
'GSETTINGS_BACKEND=memory',
|
||||
'MALLOC_CHECK_=2'
|
||||
]
|
||||
|
||||
test_cflags = '-DTEST_DATA_DIR="@0@"'.format(join_paths(meson.source_root(), 'data'))
|
||||
test_cflags = '-DTEST_DATA_DIR="@0@"'.format(meson.source_root() / 'data')
|
||||
|
||||
################
|
||||
# libgcal-test #
|
||||
|
||||
Reference in New Issue
Block a user