From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 16 Oct 2020 09:04:28 +0000 (+0200)
Subject: meson: use / instead of join_paths
X-Git-Tag: v5.2.1~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f527ec4eeaea36e817d18670a426d3da47b3896c;p=thirdparty%2Fknot-resolver.git

meson: use / instead of join_paths
---

diff --git a/daemon/lua/meson.build b/daemon/lua/meson.build
index dd9be0de3..08539b0cb 100644
--- a/daemon/lua/meson.build
+++ b/daemon/lua/meson.build
@@ -9,7 +9,7 @@ config_tests += [
 ]
 
 integr_tests += [
-  ['map', join_paths(meson.current_source_dir(), 'map.test.integr')],
+  ['map', meson.current_source_dir() / 'map.test.integr'],
 ]
 
 lua_config = configuration_data()
diff --git a/daemon/meson.build b/daemon/meson.build
index 5a95e2598..86d110061 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -32,7 +32,7 @@ config_tests += [
 ]
 
 integr_tests += [
-  ['cache_insert_ns', join_paths(meson.current_source_dir(), 'cache.test', 'insert_ns.test.integr')]
+  ['cache_insert_ns', meson.current_source_dir() / 'cache.test' / 'insert_ns.test.integr']
 ]
 
 kresd_deps = [
diff --git a/doc/meson.build b/doc/meson.build
index f06b6e30b..e64d8e937 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -52,14 +52,14 @@ if get_option('doc') == 'enabled'
 
   # install html docs
   install_subdir(
-    join_paths(meson.current_source_dir(), 'html'),
+    meson.current_source_dir() / 'html',
     install_dir: doc_dir,
   )
 
   if makeinfo.found()
     # install info docs
     install_subdir(
-      join_paths(meson.current_source_dir(), 'texinfo', '.install'),
+      meson.current_source_dir() / 'texinfo' / '.install',
       strip_directory: true,
       install_dir: info_dir,
     )
diff --git a/etc/config/meson.build b/etc/config/meson.build
index c01debf6d..a4a9c500b 100644
--- a/etc/config/meson.build
+++ b/etc/config/meson.build
@@ -21,7 +21,7 @@ install_data(
 # kresd.conf
 install_kresd_conf = get_option('install_kresd_conf') == 'enabled'
 if get_option('install_kresd_conf') == 'auto'
-  if run_command(['test', '-r', join_paths(etc_dir, 'kresd.conf')]).returncode() == 1
+  if run_command(['test', '-r', etc_dir / 'kresd.conf']).returncode() == 1
     install_kresd_conf = true
   endif
 endif
diff --git a/lib/meson.build b/lib/meson.build
index 03f747691..6d6ec9ce6 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -74,10 +74,10 @@ unit_tests += [
 ]
 
 integr_tests += [
-  ['cache_overflow', join_paths(meson.current_source_dir(), 'cache', 'overflow.test.integr')],
-  ['cache_minimal_nsec', join_paths(meson.current_source_dir(), 'cache', 'test.integr')],
-  ['iter_limits' , join_paths(meson.current_source_dir(), 'layer', 'test.integr')],
-  ['validate' , join_paths(meson.current_source_dir(), 'layer', 'validate.test.integr')],
+  ['cache_overflow', meson.current_source_dir() / 'cache' / 'overflow.test.integr'],
+  ['cache_minimal_nsec', meson.current_source_dir() / 'cache' / 'test.integr'],
+  ['iter_limits' , meson.current_source_dir() / 'layer' / 'test.integr'],
+  ['validate' , meson.current_source_dir() / 'layer' / 'validate.test.integr'],
 ]
 
 libkres_inc = include_directories('..')
diff --git a/meson.build b/meson.build
index af2760ef5..62e03bca8 100644
--- a/meson.build
+++ b/meson.build
@@ -45,26 +45,26 @@ endif
 
 ## Paths
 prefix = get_option('prefix')
-data_dir = join_paths(prefix, get_option('datadir'), 'knot-resolver')
-doc_dir = join_paths(prefix, get_option('datadir'), 'doc', 'knot-resolver')
-info_dir = join_paths(prefix, get_option('datadir'), 'info')
-examples_dir = join_paths(doc_dir, 'examples')
-etc_dir = join_paths(prefix, get_option('sysconfdir'), 'knot-resolver')
-lib_dir = join_paths(prefix, get_option('libdir'), 'knot-resolver')
-modules_dir = join_paths(lib_dir, 'kres_modules')
-sbin_dir = join_paths(prefix, get_option('sbindir'))
-run_dir = join_paths('/run', 'knot-resolver')
-systemd_work_dir = join_paths(prefix, get_option('localstatedir'), 'lib', 'knot-resolver')
-systemd_cache_dir = join_paths(prefix, get_option('localstatedir'), 'cache', 'knot-resolver')
-systemd_unit_dir = join_paths(prefix, 'lib', 'systemd', 'system')
-systemd_tmpfiles_dir = join_paths(prefix, 'lib', 'tmpfiles.d')
-systemd_sysusers_dir = join_paths(prefix, 'lib', 'sysusers.d')
+data_dir = prefix / get_option('datadir') / 'knot-resolver'
+doc_dir = prefix / get_option('datadir') / 'doc' / 'knot-resolver'
+info_dir = prefix / get_option('datadir') / 'info'
+examples_dir = doc_dir / 'examples'
+etc_dir = prefix / get_option('sysconfdir') / 'knot-resolver'
+lib_dir = prefix / get_option('libdir') / 'knot-resolver'
+modules_dir = lib_dir / 'kres_modules'
+sbin_dir = prefix / get_option('sbindir')
+run_dir = '/run' / 'knot-resolver'
+systemd_work_dir = prefix / get_option('localstatedir') / 'lib' / 'knot-resolver'
+systemd_cache_dir = prefix / get_option('localstatedir') / 'cache' / 'knot-resolver'
+systemd_unit_dir = prefix / 'lib' / 'systemd' / 'system'
+systemd_tmpfiles_dir = prefix / 'lib' / 'tmpfiles.d'
+systemd_sysusers_dir = prefix / 'lib' / 'sysusers.d'
 mod_inc_dir = include_directories('.', 'contrib/')
 
 ## Trust anchors
 managed_ta = get_option('managed_ta') == 'enabled'
-keyfile_default = join_paths(etc_dir, get_option('keyfile_default'))
-if keyfile_default == join_paths(etc_dir, 'root.keys')
+keyfile_default = etc_dir / get_option('keyfile_default')
+if keyfile_default == etc_dir / 'root.keys'
   managed_ta = managed_ta or get_option('managed_ta') == 'auto'
 endif
 install_root_keys = get_option('install_root_keys') == 'enabled'
@@ -74,8 +74,8 @@ endif
 
 
 ## Root hints
-root_hints = join_paths(etc_dir, get_option('root_hints'))
-if root_hints == join_paths(etc_dir, 'root.hints')
+root_hints = etc_dir / get_option('root_hints')
+if root_hints == etc_dir / 'root.hints'
   install_root_hints = true
 else
   install_root_hints = false
@@ -266,7 +266,7 @@ if flake8.found()
     command: [
       flake8,
       '--max-line-length=100',
-      join_paths(meson.source_root(), 'tests', 'pytests'),
+      meson.source_root() / 'tests' / 'pytests',
     ],
   )
 endif
diff --git a/modules/bogus_log/meson.build b/modules/bogus_log/meson.build
index 25416706d..44ff07461 100644
--- a/modules/bogus_log/meson.build
+++ b/modules/bogus_log/meson.build
@@ -16,5 +16,5 @@ bogus_log_mod = shared_module(
 )
 
 integr_tests += [
-  ['bogus_log', join_paths(meson.current_source_dir(), 'test.integr')],
+  ['bogus_log', meson.current_source_dir() / 'test.integr'],
 ]
diff --git a/modules/daf/meson.build b/modules/daf/meson.build
index 94a3ebeef..c46b74925 100644
--- a/modules/daf/meson.build
+++ b/modules/daf/meson.build
@@ -7,7 +7,7 @@ config_tests += [
 ]
 
 integr_tests += [
-  ['daf', join_paths(meson.current_source_dir(), 'test.integr')],
+  ['daf', meson.current_source_dir() / 'test.integr'],
 ]
 
 lua_mod_src += [
@@ -17,5 +17,5 @@ lua_mod_src += [
 # install daf.js
 install_data(
   'daf.js',
-  install_dir: join_paths(modules_dir, 'daf'),
+  install_dir: modules_dir / 'daf',
 )
diff --git a/modules/dnstap/meson.build b/modules/dnstap/meson.build
index 09aa459a4..bca503330 100644
--- a/modules/dnstap/meson.build
+++ b/modules/dnstap/meson.build
@@ -30,7 +30,7 @@ if build_dnstap
       protoc_c,
       '--c_out=' + meson.current_build_dir(),
       '--proto_path', meson.current_source_dir(),
-      join_paths([meson.current_source_dir(), 'dnstap.proto']),
+      meson.current_source_dir() / 'dnstap.proto',
     ],
     output: [
       'dnstap.pb-c.h',
diff --git a/modules/experimental_dot_auth/meson.build b/modules/experimental_dot_auth/meson.build
index c9674ee1b..e2e1edf1c 100644
--- a/modules/experimental_dot_auth/meson.build
+++ b/modules/experimental_dot_auth/meson.build
@@ -9,5 +9,5 @@ lua_mod_src += [
 install_subdir(
   'static',
   strip_directory: true,
-  install_dir: join_paths(modules_dir, 'http'),
+  install_dir: modules_dir / 'http',
 )
diff --git a/modules/http/meson.build b/modules/http/meson.build
index adc3e261b..6705143c3 100644
--- a/modules/http/meson.build
+++ b/modules/http/meson.build
@@ -41,7 +41,7 @@ install_subdir(
     'selectize.spdx',
     'topojson.spdx',
   ],
-  install_dir: join_paths(modules_dir, 'http'),
+  install_dir: modules_dir / 'http',
 )
 
 # auxiliary debug library for HTTP module
diff --git a/modules/meson.build b/modules/meson.build
index c7b62b906..685eb2018 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -27,8 +27,8 @@ config_tests += [
 ]
 
 integr_tests += [
-  ['rebinding', join_paths(meson.current_source_dir(), 'rebinding', 'test.integr')],
-  ['serve_stale', join_paths(meson.current_source_dir(), 'serve_stale', 'test.integr')],
+  ['rebinding', meson.current_source_dir() / 'rebinding' / 'test.integr'],
+  ['serve_stale', meson.current_source_dir() / 'serve_stale' / 'test.integr'],
   # NOTE: ta_update may pass in cases when it should fail due to race conditions
   # To ensure reliability, deckard should introduce a time wait
 ]
diff --git a/modules/policy/meson.build b/modules/policy/meson.build
index 8a4991349..fd51b0fda 100644
--- a/modules/policy/meson.build
+++ b/modules/policy/meson.build
@@ -12,9 +12,9 @@ config_tests += [
 ]
 
 integr_tests += [
-  ['policy', join_paths(meson.current_source_dir(), 'test.integr')],
-  ['policy.noipv6', join_paths(meson.current_source_dir(), 'noipv6.test.integr')],
-  ['policy.noipvx', join_paths(meson.current_source_dir(), 'noipvx.test.integr')],
+  ['policy', meson.current_source_dir() / 'test.integr'],
+  ['policy.noipv6', meson.current_source_dir() / 'noipv6.test.integr'],
+  ['policy.noipvx', meson.current_source_dir() / 'noipvx.test.integr'],
 ]
 
 # check git submodules were initialized
diff --git a/modules/refuse_nord/meson.build b/modules/refuse_nord/meson.build
index 40abccea8..fcc4e838b 100644
--- a/modules/refuse_nord/meson.build
+++ b/modules/refuse_nord/meson.build
@@ -2,7 +2,7 @@
 # C module: refuse_nord
 
 integr_tests += [
-  ['refuse_nord', join_paths(meson.current_source_dir(), 'test.integr')],
+  ['refuse_nord', meson.current_source_dir() / 'test.integr'],
 ]
 
 refuse_nord_src = files([
diff --git a/modules/stats/meson.build b/modules/stats/meson.build
index ee1b3302a..68dd4111c 100644
--- a/modules/stats/meson.build
+++ b/modules/stats/meson.build
@@ -7,7 +7,7 @@ stats_src = files([
 c_src_lint += stats_src
 
 integr_tests += [
-  ['stats', join_paths(meson.current_source_dir(), 'test.integr')],
+  ['stats', meson.current_source_dir() / 'test.integr'],
 ]
 
 
diff --git a/modules/ta_update/meson.build b/modules/ta_update/meson.build
index 07ade0e07..f295cba0f 100644
--- a/modules/ta_update/meson.build
+++ b/modules/ta_update/meson.build
@@ -6,8 +6,8 @@ config_tests += [
 ]
 
 integr_tests += [
-  ['ta_update', join_paths(meson.current_source_dir(), 'ta_update.test.integr')],
-  ['ta_update.unmanagedkey', join_paths(meson.current_source_dir(), 'ta_update.unmanagedkey.test.integr')],
+  ['ta_update', meson.current_source_dir() / 'ta_update.test.integr'],
+  ['ta_update.unmanagedkey', meson.current_source_dir() / 'ta_update.unmanagedkey.test.integr'],
 ]
 
 lua_mod_src += [
@@ -15,5 +15,5 @@ lua_mod_src += [
 ]
 
 install_data(
-  install_dir: join_paths(modules_dir, 'ta_update'),
+  install_dir: modules_dir / 'ta_update',
 )
diff --git a/modules/view/meson.build b/modules/view/meson.build
index 62808847a..233448b54 100644
--- a/modules/view/meson.build
+++ b/modules/view/meson.build
@@ -6,6 +6,6 @@ lua_mod_src += [
 ]
 
 integr_tests += [
-  ['view.tsig', join_paths(meson.current_source_dir(), 'tsig.test.integr')],
-  ['view.addr', join_paths(meson.current_source_dir(), 'addr.test.integr')],
+  ['view.tsig', meson.current_source_dir() / 'tsig.test.integr'],
+  ['view.addr', meson.current_source_dir() / 'addr.test.integr'],
 ]
diff --git a/tests/integration/meson.build b/tests/integration/meson.build
index 439633adb..e86eb0ac8 100644
--- a/tests/integration/meson.build
+++ b/tests/integration/meson.build
@@ -41,7 +41,7 @@ test(
 
 deckard_run = find_program('deckard/run.sh')
 foreach integr_test : integr_tests
-  deckard_config_path = join_paths(integr_test[1], 'deckard.yaml')
+  deckard_config_path = integr_test[1] / 'deckard.yaml'
   test(
     'integration.' + integr_test[0],
     deckard_run,
diff --git a/utils/cache_gc/meson.build b/utils/cache_gc/meson.build
index 1febfabb5..02ab6c639 100644
--- a/utils/cache_gc/meson.build
+++ b/utils/cache_gc/meson.build
@@ -25,7 +25,7 @@ if build_utils
   )
 
 integr_tests += [
-  ['gc_cache_overflow', join_paths(meson.current_source_dir(), 'test.integr')],
+  ['gc_cache_overflow', meson.current_source_dir() / 'test.integr'],
 ]
 
 endif