Merge pull request #13383 from xokdvium/meson-format-multiline

Restore multiline formatting of lists in meson files

meson.build

@@ -6,7 +6,10 @@ project(
   'cpp',
   version : files('.version'),
   subproject_dir : 'src',
-  default_options : [ 'localstatedir=/nix/var' ],
+  default_options : [
+    'localstatedir=/nix/var',
+    # hack for trailing newline
+  ],
   meson_version : '>= 1.1',
 )
 

src/libexpr-test-support/include/nix/expr/tests/meson.build

@@ -2,4 +2,9 @@
 
 include_dirs = [ include_directories('../../..') ]
 
-headers = files('libexpr.hh', 'nix_api_expr.hh', 'value/context.hh')
+headers = files(
+  'libexpr.hh',
+  'nix_api_expr.hh',
+  'value/context.hh',
+  # hack for trailing newline
+)

src/libstore/linux/include/nix/store/meson.build

@@ -1,3 +1,6 @@
 include_dirs += include_directories('../..')
 
-headers += files('personality.hh')
+headers += files(
+  'personality.hh',
+  # hack for trailing newline
+)

src/libstore/linux/meson.build

@@ -1,3 +1,6 @@
-sources += files('personality.cc')
+sources += files(
+  'personality.cc',
+  # hack for trailing newline
+)
 
 subdir('include/nix/store')

src/libutil/freebsd/include/nix/util/meson.build

@@ -2,4 +2,7 @@
 
 include_dirs += include_directories('../..')
 
-headers += files('freebsd-jail.hh')
+headers += files(
+  'freebsd-jail.hh',
+  # hack for trailing newline
+)

src/libutil/freebsd/meson.build

@@ -1,3 +1,6 @@
-sources += files('freebsd-jail.cc')
+sources += files(
+  'freebsd-jail.cc',
+  # hack for trailing newline
+)
 
 subdir('include/nix/util')

src/libutil/linux/include/nix/util/meson.build

@@ -2,4 +2,8 @@
 
 include_dirs += include_directories('../..')
 
-headers += files('cgroup.hh', 'linux-namespaces.hh')
+headers += files(
+  'cgroup.hh',
+  'linux-namespaces.hh',
+  # hack for trailing newline
+)

src/libutil/linux/meson.build

@@ -1,3 +1,7 @@
-sources += files('cgroup.cc', 'linux-namespaces.cc')
+sources += files(
+  'cgroup.cc',
+  'linux-namespaces.cc',
+  # hack for trailing newline
+)
 
 subdir('include/nix/util')

src/libutil/windows/include/nix/util/meson.build

@@ -2,4 +2,9 @@
 
 include_dirs += include_directories('../..')
 
-headers += files('signals-impl.hh', 'windows-async-pipe.hh', 'windows-error.hh')
+headers += files(
+  'signals-impl.hh',
+  'windows-async-pipe.hh',
+  'windows-error.hh',
+  # hack for trailing newline
+)

src/perl/t/meson.build

@@ -5,7 +5,10 @@
 # src
 #---------------------------------------------------
 
-nix_perl_tests = files('init.t')
+nix_perl_tests = files(
+  'init.t',
+  # hack for trailing newline
+)
 
 
 foreach f : nix_perl_tests

tests/functional/plugins/meson.build

@@ -1,6 +1,9 @@
 libplugintest = shared_module(
   'plugintest',
   'plugintest.cc',
-  dependencies : [ dependency('nix-expr') ],
+  dependencies : [
+    dependency('nix-expr'),
+    # hack for trailing newline
+  ],
   build_by_default : false,
 )

tests/functional/test-libstoreconsumer/meson.build

@@ -1,6 +1,9 @@
 libstoreconsumer_tester = executable(
   'test-libstoreconsumer',
   'main.cc',
-  dependencies : [ dependency('nix-store') ],
+  dependencies : [
+    dependency('nix-store'),
+    # hack for trailing newline
+  ],
   build_by_default : false,
 )