From f0aaf39253ab9dc1abb1c4e54115e4ea373d9a55 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Tue, 6 Mar 2018 08:19:58 +0100 Subject: [PATCH] Meson build system: Add missing '#' in masked blocks --- shell-completion/bash/meson.build | 2 +- shell-completion/zsh/meson.build | 2 +- src/basic/meson.build | 2 +- src/core/meson.build | 26 ++--- src/login/meson.build | 12 +-- src/shared/meson.build | 2 +- src/systemd/meson.build | 2 +- src/test/meson.build | 154 +++++++++++++++--------------- 8 files changed, 101 insertions(+), 101 deletions(-) diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build index 58c875536..734bd8fff 100644 --- a/shell-completion/bash/meson.build +++ b/shell-completion/bash/meson.build @@ -16,7 +16,7 @@ if bashcompletiondir != 'no' # input : 'systemctl.in', # output : 'systemctl', # configuration : substs) - +# # items = [['busctl', ''], # ['journalctl', ''], # ['systemd-analyze', ''], diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build index 352f294a6..b4277330c 100644 --- a/shell-completion/zsh/meson.build +++ b/shell-completion/zsh/meson.build @@ -11,7 +11,7 @@ if zshcompletiondir != 'no' # input : '_systemctl.in', # output : '_systemctl', # configuration : substs) - +# # items = [['_busctl', ''], # ['_journalctl', ''], # ['_systemd-analyze', ''], diff --git a/src/basic/meson.build b/src/basic/meson.build index 5cdc316d2..987ca0a97 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -351,7 +351,7 @@ generate_gperfs = find_program('generate-gperfs.py') # output : 'af-list.txt', # command : [generate_af_list, cpp], # capture : true) - +# # generate_arphrd_list = find_program('generate-arphrd-list.sh') # arphrd_list_txt = custom_target( # 'arphrd-list.txt', diff --git a/src/core/meson.build b/src/core/meson.build index e58312d81..8da7c391a 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -133,13 +133,13 @@ libcore_la_sources = files(''' # output: 'load-fragment-gperf.gperf', # command : [m4, '-P'] + m4_defines + ['@INPUT@'], # capture : true) - +# # load_fragment_gperf_c = custom_target( # 'load-fragment-gperf.c', # input : load_fragment_gperf_gperf, # output : 'load-fragment-gperf.c', # command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) - +# # awkscript = 'load-fragment-gperf-nulstr.awk' # load_fragment_gperf_nulstr_c = custom_target( # 'load-fragment-gperf-nulstr.c', @@ -147,7 +147,7 @@ libcore_la_sources = files(''' # output : 'load-fragment-gperf-nulstr.c', # command : [awk, '-f', '@INPUT0@', '@INPUT1@'], # capture : true) - +# # libcore = static_library( # 'core', # libcore_la_sources, @@ -162,9 +162,9 @@ libcore_la_sources = files(''' # libkmod, # libapparmor, # libmount]) - +# # systemd_sources = files('main.c') - +# # systemd_shutdown_sources = files(''' # shutdown.c # umount.c @@ -174,15 +174,15 @@ libcore_la_sources = files(''' # killall.c # killall.h # '''.split()) - +# # in_files = [['macros.systemd', rpmmacrosdir], # ['triggers.systemd', ''], # ['systemd.pc', pkgconfigdatadir]] - +# # foreach item : in_files # file = item[0] # dir = item[1] - +# # # If 'no', disable generation completely. # # If '', generate, but do not install. # if dir != 'no' @@ -196,17 +196,17 @@ libcore_la_sources = files(''' # endif # endif # endforeach - +# # install_data('org.freedesktop.systemd1.conf', # install_dir : dbuspolicydir) # install_data('org.freedesktop.systemd1.service', # install_dir : dbussystemservicedir) - +# # policy_in = configure_file( # input : 'org.freedesktop.systemd1.policy.in.in', # output : 'org.freedesktop.systemd1.policy.in', # configuration : substs) - +# # custom_target( # 'org.freedesktop.systemd1.policy', # input : policy_in, @@ -231,12 +231,12 @@ libcore_la_sources = files(''' # install_data('system.conf', # 'user.conf', # install_dir : pkgsysconfdir) - +# # meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir)) # meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) # meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) # meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) - +# # meson.add_install_script('sh', '-c', # mkdir_p.format(join_paths(pkgsysconfdir, 'system/multi-user.target.wants'))) # meson.add_install_script('sh', '-c', diff --git a/src/login/meson.build b/src/login/meson.build index f8fbfbc67..b46576d68 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -96,15 +96,15 @@ loginctl_sources += files(''' # configuration : substs) # install_data(logind_conf, # install_dir : pkgsysconfdir) - +# # pam_systemd_sym = 'src/login/pam_systemd.sym' # pam_systemd_c = files('pam_systemd.c') - +# # install_data('org.freedesktop.login1.conf', # install_dir : dbuspolicydir) # install_data('org.freedesktop.login1.service', # install_dir : dbussystemservicedir) - +# # custom_target( # 'org.freedesktop.login1.policy', # input : 'org.freedesktop.login1.policy.in', @@ -112,11 +112,11 @@ loginctl_sources += files(''' # command : intltool_command, # install : install_polkit, # install_dir : polkitpolicydir) - +# # install_data('70-power-switch.rules', # '70-uaccess.rules', # install_dir : udevrulesdir) - +# # foreach file : ['71-seat.rules', # '73-seat-late.rules'] # gen = configure_file( @@ -126,7 +126,7 @@ loginctl_sources += files(''' # install_data(gen, # install_dir : udevrulesdir) # endforeach - +# # custom_target( # 'systemd-user', # input : 'systemd-user.m4', diff --git a/src/shared/meson.build b/src/shared/meson.build index 24f2185bb..bb4024888 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -139,7 +139,7 @@ endif # if conf.get('HAVE_SECCOMP') == 1 # shared_sources += ['seccomp-util.c'] # endif - +# # if conf.get('HAVE_LIBIPTC') == 1 # shared_sources += ['firewall-util.c'] # endif diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 17016488e..8499f16c4 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -50,12 +50,12 @@ install_headers( # subdir : 'systemd') #else subdir : 'elogind/systemd') -#endif // 0 meson.add_install_script(meson_symlink_headers, includedir, _systemd_headers, '_sd-common.h') +#endif // 0 ############################################################ diff --git a/src/test/meson.build b/src/test/meson.build index d374629fa..77722de00 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -46,7 +46,7 @@ tests += [ # [['src/test/test-device-nodes.c'], # [], # []], - +# # [['src/test/test-engine.c', # 'src/test/test-helper.c'], # [libcore, @@ -58,7 +58,7 @@ tests += [ # libselinux, # libmount, # libblkid]], - +# # [['src/test/test-job-type.c'], # [libcore, # libshared], @@ -68,7 +68,7 @@ tests += [ # libselinux, # libmount, # libblkid]], - +# # [['src/test/test-ns.c'], # [libcore, # libshared], @@ -79,7 +79,7 @@ tests += [ # libmount, # libblkid], # '', 'manual'], - +# # [['src/test/test-loopback.c'], # [libcore, # libshared], @@ -89,7 +89,7 @@ tests += [ # libselinux, # libmount, # libblkid]], - +# # [['src/test/test-hostname.c'], # [libcore, # libshared], @@ -100,17 +100,17 @@ tests += [ # libmount, # libblkid], # '', 'unsafe'], - +# # [['src/test/test-dns-domain.c'], # [libcore, # libelogind_network], # []], - +# # [['src/test/test-boot-timestamps.c'], # [], # [], # 'ENABLE_EFI'], - +# # [['src/test/test-unit-name.c', # 'src/test/test-helper.c'], # [libcore, @@ -121,7 +121,7 @@ tests += [ # libselinux, # libmount, # libblkid]], - +# # [['src/test/test-unit-file.c', # 'src/test/test-helper.c'], # [libcore, @@ -142,7 +142,7 @@ tests += [ # [['src/test/test-capability.c'], # [], # [libcap]], - +# # [['src/test/test-async.c'], # [], # []], @@ -160,15 +160,15 @@ tests += [ # [['src/test/test-sigbus.c'], # [], # []], - +# # [['src/test/test-condition.c'], # [], # []], - +# # [['src/test/test-fdset.c'], # [], # []], - +# # [['src/test/test-fstab-util.c'], # [], # []], @@ -238,7 +238,7 @@ tests += [ # [['src/test/test-web-util.c'], # [], # []], - +# # [['src/test/test-cpu-set-util.c'], # [], # []], @@ -282,36 +282,36 @@ tests += [ # [['src/test/test-terminal-util.c'], # [], # []], - +# # [['src/test/test-path-lookup.c'], # [], # []], - +# # [['src/test/test-uid-range.c'], # [], # []], - +# # [['src/test/test-cap-list.c', # generated_gperf_headers], # [], # [libcap]], - +# # [['src/test/test-socket-util.c'], # [], # []], - +# # [['src/test/test-in-addr-util.c'], # [], # []], - +# # [['src/test/test-barrier.c'], # [], # []], - +# # [['src/test/test-tmpfiles.c'], # [], # []], - +# # [['src/test/test-namespace.c'], # [libcore, # libshared], @@ -327,26 +327,26 @@ tests += [ # [['src/test/test-install-root.c'], # [], # []], - +# # [['src/test/test-acl-util.c'], # [], # [], # 'HAVE_ACL'], - +# # [['src/test/test-seccomp.c'], # [], # [libseccomp], # 'HAVE_SECCOMP'], - +# # [['src/test/test-rlimit-util.c'], # [], # []], - +# # [['src/test/test-ask-password-api.c'], # [], # [], # '', 'manual'], - +# # [['src/test/test-dissect-image.c'], # [], # [libblkid], @@ -393,7 +393,7 @@ tests += [ # [['src/test/test-bitmap.c'], # [], # []], - +# # [['src/test/test-xml.c'], # [], # []], @@ -435,15 +435,15 @@ tests += [ # [['src/test/test-fileio.c'], # [], # []], - +# # [['src/test/test-time.c'], # [], # []], - +# # [['src/test/test-clock.c'], # [], # []], - +# # [['src/test/test-architecture.c'], # [], # []], @@ -463,13 +463,13 @@ tests += [ # [], # [], # '', 'manual'], - - +# +# # [['src/test/test-firewall-util.c'], # [libshared], # [], # 'HAVE_LIBIPTC'], - +# # [['src/test/test-netlink-manual.c'], # [], # [libkmod], @@ -484,15 +484,15 @@ tests += [ # [['src/test/test-date.c'], # [], # []], - +# # [['src/test/test-sleep.c'], # [], # []], - +# # [['src/test/test-replace-var.c'], # [], # []], - +# # [['src/test/test-calendarspec.c'], # [], # []], @@ -525,19 +525,19 @@ tests += [ # libselinux, # libmount, # libblkid]], - +# # [['src/test/test-cgroup-util.c'], # [], # []], - +# # [['src/test/test-env-util.c'], # [], # []], - +# # [['src/test/test-strbuf.c'], # [], # []], - +# # [['src/test/test-strv.c'], # [], # []], @@ -558,7 +558,7 @@ tests += [ # libselinux, # libmount, # libblkid]], - +# # [['src/test/test-execute.c', # 'src/test/test-helper.c'], # [libcore, @@ -579,17 +579,17 @@ tests += [ # [['src/test/test-strxcpyx.c'], # [], # []], - +# # [['src/test/test-install.c'], # [libcore, # libshared], # [], # '', 'manual'], - +# # [['src/test/test-watchdog.c'], # [], # []], - +# # [['src/test/test-sched-prio.c', # 'src/test/test-helper.c'], # [libcore, @@ -615,20 +615,20 @@ tests += [ # generated_gperf_headers], # [], # []], - +# # [['src/test/test-arphrd-list.c', # generated_gperf_headers], # [], # []], - +# # [['src/test/test-journal-importer.c'], # [], # []], - +# # [['src/test/test-libudev.c'], # [libshared], # []], - +# # [['src/test/test-udev.c'], # [libudev_core, # libudev_internal, @@ -670,14 +670,14 @@ tests += [ # [threads, # libxz, # liblz4]], - +# # [['src/journal/test-journal-send.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], - +# # [['src/journal/test-journal-syslog.c'], # [libjournal_core, # libshared], @@ -685,63 +685,63 @@ tests += [ # libxz, # liblz4, # libselinux]], - +# # [['src/journal/test-journal-match.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], - +# # [['src/journal/test-journal-enum.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], - +# # [['src/journal/test-journal-stream.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], - +# # [['src/journal/test-journal-flush.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], - +# # [['src/journal/test-journal-init.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], - +# # [['src/journal/test-journal-verify.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], - +# # [['src/journal/test-journal-interleaving.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], - +# # [['src/journal/test-mmap-cache.c'], # [libjournal_core, # libshared], # [threads, # libxz, # liblz4]], - +# # [['src/journal/test-catalog.c'], # [libjournal_core, # libshared], @@ -749,20 +749,20 @@ tests += [ # libxz, # liblz4], # '', '', '-DCATALOG_DIR="@0@"'.format(build_catalog_dir)], - +# # [['src/journal/test-compress.c'], # [libjournal_core, # libshared], # [liblz4, # libxz]], - +# # [['src/journal/test-compress-benchmark.c'], # [libjournal_core, # libshared], # [liblz4, # libxz], # '', 'timeout=90'], - +# # [['src/journal/test-audit-type.c'], # [libjournal_core, # libshared], @@ -792,7 +792,7 @@ tests += [ # [['src/libelogind/sd-bus/test-bus-chat.c'], # [], # [threads]], - +# # [['src/libelogind/sd-bus/test-bus-cleanup.c'], # [], # [threads, @@ -830,7 +830,7 @@ tests += [ # [libglib, # libgobject, # libgio]], - +# # [['src/libelogind/sd-bus/test-bus-creds.c'], # [], # []], @@ -859,11 +859,11 @@ tests += [ # [['src/libelogind/sd-netlink/test-netlink.c'], # [], # []], - +# # [['src/libelogind/sd-netlink/test-local-addresses.c'], # [], # []], - +# # [['src/libelogind/sd-resolve/test-resolve.c'], # [], # [threads]], @@ -894,13 +894,13 @@ tests += [ # [libshared, # libelogind_network], # []], - +# # [['src/libelogind-network/test-sd-dhcp-lease.c', # 'src/libelogind-network/dhcp-lease-internal.h'], # [libshared, # libelogind_network], # []], - +# # [['src/libelogind-network/test-dhcp-client.c', # 'src/libelogind-network/dhcp-protocol.h', # 'src/libelogind-network/dhcp-internal.h', @@ -908,33 +908,33 @@ tests += [ # [libshared, # libelogind_network], # []], - +# # [['src/libelogind-network/test-dhcp-server.c'], # [libshared, # libelogind_network], # []], - +# # [['src/libelogind-network/test-ipv4ll.c', # 'src/libelogind-network/arp-util.h', # 'src/systemd/sd-ipv4ll.h'], # [libshared, # libelogind_network], # []], - +# # [['src/libelogind-network/test-ipv4ll-manual.c', # 'src/systemd/sd-ipv4ll.h'], # [libshared, # libelogind_network], # [], # '', 'manual'], - +# # [['src/libelogind-network/test-acd.c', # 'src/systemd/sd-ipv4acd.h'], # [libshared, # libelogind_network], # [], # '', 'manual'], - +# # [['src/libelogind-network/test-ndisc-rs.c', # 'src/libelogind-network/dhcp-identifier.h', # 'src/libelogind-network/dhcp-identifier.c', @@ -944,14 +944,14 @@ tests += [ # [libshared, # libelogind_network], # []], - +# # [['src/libelogind-network/test-ndisc-ra.c', # 'src/libelogind-network/icmp6-util.h', # 'src/systemd/sd-ndisc.h'], # [libshared, # libelogind_network], # []], - +# # [['src/libelogind-network/test-dhcp6-client.c', # 'src/libelogind-network/dhcp-identifier.h', # 'src/libelogind-network/dhcp-identifier.c', @@ -960,7 +960,7 @@ tests += [ # [libshared, # libelogind_network], # []], - +# # [['src/libelogind-network/test-lldp.c'], # [libshared, # libelogind_network], -- 2.30.2