[pitivi/1.0] Use join_paths in meson.build files
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/1.0] Use join_paths in meson.build files
- Date: Sat, 17 Feb 2018 20:48:45 +0000 (UTC)
commit e4b370cfdfef8d16ed2ef59e0449d4cdd331b8a5
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Fri Feb 16 22:11:37 2018 +0100
Use join_paths in meson.build files
help/el/meson.build | 7 +++----
help/es/meson.build | 7 +++----
help/fr/meson.build | 7 +++----
help/sl/meson.build | 7 +++----
help/sv/meson.build | 7 +++----
help/uk/meson.build | 7 +++----
tests/validate-tests/meson.build | 2 +-
7 files changed, 19 insertions(+), 25 deletions(-)
---
diff --git a/help/el/meson.build b/help/el/meson.build
index a7c5889..e1bca0e 100644
--- a/help/el/meson.build
+++ b/help/el/meson.build
@@ -1,6 +1,6 @@
lang = 'el'
-_help_installdir = get_option('datadir') + '/help/' + lang + '/pitivi/'
+_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi')
install_subdir('figures', install_dir: _help_installdir)
mo = custom_target(lang + '.mo',
@@ -11,9 +11,8 @@ mo = custom_target(lang + '.mo',
foreach help_page: help_pages
custom_target(lang + '.' + help_page + '.page',
output : help_page,
- input : '../C/' + help_page,
+ input : join_paths('../C', help_page),
command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'],
install: true,
- install_dir: get_option('datadir') + '/help/' + lang + '/pitivi/')
+ install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi'))
endforeach
-
diff --git a/help/es/meson.build b/help/es/meson.build
index 3d6f498..9f5704b 100644
--- a/help/es/meson.build
+++ b/help/es/meson.build
@@ -1,6 +1,6 @@
lang = 'es'
-_help_installdir = get_option('datadir') + '/help/' + lang + '/pitivi/'
+_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi')
install_subdir('figures', install_dir: _help_installdir)
mo = custom_target(lang + '.mo',
@@ -11,9 +11,8 @@ mo = custom_target(lang + '.mo',
foreach help_page: help_pages
custom_target(lang + '.' + help_page + '.page',
output : help_page,
- input : '../C/' + help_page,
+ input : join_paths('../C', help_page),
command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'],
install: true,
- install_dir: get_option('datadir') + '/help/' + lang + '/pitivi/')
+ install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi'))
endforeach
-
diff --git a/help/fr/meson.build b/help/fr/meson.build
index 6c1ab01..8bf5f2f 100644
--- a/help/fr/meson.build
+++ b/help/fr/meson.build
@@ -1,6 +1,6 @@
lang = 'fr'
-_help_installdir = get_option('datadir') + '/help/' + lang + '/pitivi/'
+_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi')
install_subdir('figures', install_dir: _help_installdir)
mo = custom_target(lang + '.mo',
@@ -11,9 +11,8 @@ mo = custom_target(lang + '.mo',
foreach help_page: help_pages
custom_target(lang + '.' + help_page + '.page',
output : help_page,
- input : '../C/' + help_page,
+ input : join_paths('../C', help_page),
command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'],
install: true,
- install_dir: get_option('datadir') + '/help/' + lang + '/pitivi/')
+ install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi'))
endforeach
-
diff --git a/help/sl/meson.build b/help/sl/meson.build
index 8924d59..3931c9a 100644
--- a/help/sl/meson.build
+++ b/help/sl/meson.build
@@ -1,6 +1,6 @@
lang = 'sl'
-_help_installdir = get_option('datadir') + '/help/' + lang + '/pitivi/'
+_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi')
install_subdir('figures', install_dir: _help_installdir)
mo = custom_target(lang + '.mo',
@@ -11,9 +11,8 @@ mo = custom_target(lang + '.mo',
foreach help_page: help_pages
custom_target(lang + '.' + help_page + '.page',
output : help_page,
- input : '../C/' + help_page,
+ input : join_paths('../C', help_page),
command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'],
install: true,
- install_dir: get_option('datadir') + '/help/' + lang + '/pitivi/')
+ install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi'))
endforeach
-
diff --git a/help/sv/meson.build b/help/sv/meson.build
index e66457c..f1cb574 100644
--- a/help/sv/meson.build
+++ b/help/sv/meson.build
@@ -1,6 +1,6 @@
lang = 'sv'
-_help_installdir = get_option('datadir') + '/help/' + lang + '/pitivi/'
+_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi')
install_subdir('figures', install_dir: _help_installdir)
mo = custom_target(lang + '.mo',
@@ -11,9 +11,8 @@ mo = custom_target(lang + '.mo',
foreach help_page: help_pages
custom_target(lang + '.' + help_page + '.page',
output : help_page,
- input : '../C/' + help_page,
+ input : join_paths('../C', help_page),
command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'],
install: true,
- install_dir: get_option('datadir') + '/help/' + lang + '/pitivi/')
+ install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi'))
endforeach
-
diff --git a/help/uk/meson.build b/help/uk/meson.build
index beda592..37c9a22 100644
--- a/help/uk/meson.build
+++ b/help/uk/meson.build
@@ -1,6 +1,6 @@
lang = 'uk'
-_help_installdir = get_option('datadir') + '/help/' + lang + '/pitivi/'
+_help_installdir = join_paths(get_option('datadir'), 'help', lang, 'pitivi')
install_subdir('figures', install_dir: _help_installdir)
mo = custom_target(lang + '.mo',
@@ -11,9 +11,8 @@ mo = custom_target(lang + '.mo',
foreach help_page: help_pages
custom_target(lang + '.' + help_page + '.page',
output : help_page,
- input : '../C/' + help_page,
+ input : join_paths('../C', help_page),
command : [itstool, '-m', mo,'@INPUT@', '--output', '@OUTPUT@'],
install: true,
- install_dir: get_option('datadir') + '/help/' + lang + '/pitivi/')
+ install_dir: join_paths(get_option('datadir'), 'help', lang, 'pitivi'))
endforeach
-
diff --git a/tests/validate-tests/meson.build b/tests/validate-tests/meson.build
index 1ace174..d76d287 100644
--- a/tests/validate-tests/meson.build
+++ b/tests/validate-tests/meson.build
@@ -1,5 +1,5 @@
gstvalidate = find_program('gst-validate-launcher', required : false)
if gstvalidate.found()
- run_target('validate', command : [meson.current_source_dir() + '/runtests'])
+ run_target('validate', command : [join_paths(meson.current_source_dir(), 'runtests')])
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]