Skip to content

Commit 37efbbd

Browse files
keszybzkeszybz
committed
meson: reindent all files with 8 spaces
The indentation for emacs'es meson-mode is added .dir-locals. All files are reindented automatically, using the lasest meson-mode from git. Indentation should now be fairly consistent.
1 parent 0a76b0e commit 37efbbd

File tree

45 files changed

+4137
-4212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4137
-4212
lines changed

‎.dir-locals.el‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
(eval . (c-set-offset 'arglist-intro '++))
2121
(eval . (c-set-offset 'arglist-close 0))))
2222
(nxml-mode . ((nxml-child-indent . 2)
23-
(fill-column . 119))))
23+
(fill-column . 119)))
24+
(meson-mode . ((meson-indent-basic . 8))))

‎catalog/meson.build‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
# -*- mode: meson -*-
2-
31
in_files = '''
4-
systemd.bg.catalog
5-
systemd.be.catalog
6-
systemd.be@latin.catalog
7-
systemd.fr.catalog
8-
systemd.it.catalog
9-
systemd.pl.catalog
10-
systemd.pt_BR.catalog
11-
systemd.ru.catalog
12-
systemd.zh_CN.catalog
13-
systemd.zh_TW.catalog
14-
systemd.catalog
2+
systemd.bg.catalog
3+
systemd.be.catalog
4+
systemd.be@latin.catalog
5+
systemd.fr.catalog
6+
systemd.it.catalog
7+
systemd.pl.catalog
8+
systemd.pt_BR.catalog
9+
systemd.ru.catalog
10+
systemd.zh_CN.catalog
11+
systemd.zh_TW.catalog
12+
systemd.catalog
1513
'''.split()
1614

1715
support_url = get_option('support-url')
1816
support_sed = 's~%SUPPORT_URL%~@0@~'.format(support_url)
1917
build_catalog_dir = meson.current_build_dir()
2018

2119
foreach file : in_files
22-
custom_target(
23-
file,
24-
input : file + '.in',
25-
output: file,
26-
command : [sed, support_sed, '@INPUT@'],
27-
capture : true,
28-
install : true,
29-
install_dir : catalogdir)
20+
custom_target(
21+
file,
22+
input : file + '.in',
23+
output: file,
24+
command : [sed, support_sed, '@INPUT@'],
25+
capture : true,
26+
install : true,
27+
install_dir : catalogdir)
3028
endforeach

‎docs/sysvinit/meson.build‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
# -*- mode: meson -*-
2-
31
file = configure_file(
4-
input : 'README.in',
5-
output : 'README',
6-
configuration : substs)
2+
input : 'README.in',
3+
output : 'README',
4+
configuration : substs)
75
install_data(file,
86
install_dir : sysvinit_path)

‎docs/var-log/meson.build‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
# -*- mode: meson -*-
2-
31
file = configure_file(
4-
input : 'README.in',
5-
output : 'README',
6-
configuration : substs)
2+
input : 'README.in',
3+
output : 'README',
4+
configuration : substs)
75
install_data(file,
86
install_dir : varlogdir)

‎hwdb/meson.build‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
1-
# -*- mode: meson -*-
2-
31
hwdb_files = files('''
4-
20-pci-vendor-model.hwdb
5-
20-pci-classes.hwdb
6-
20-usb-vendor-model.hwdb
7-
20-usb-classes.hwdb
8-
20-sdio-vendor-model.hwdb
9-
20-sdio-classes.hwdb
10-
20-bluetooth-vendor-product.hwdb
11-
20-acpi-vendor.hwdb
12-
20-OUI.hwdb
13-
20-net-ifname.hwdb
14-
60-evdev.hwdb
15-
60-keyboard.hwdb
16-
60-sensor.hwdb
17-
70-mouse.hwdb
18-
70-pointingstick.hwdb
19-
70-touchpad.hwdb
2+
20-pci-vendor-model.hwdb
3+
20-pci-classes.hwdb
4+
20-usb-vendor-model.hwdb
5+
20-usb-classes.hwdb
6+
20-sdio-vendor-model.hwdb
7+
20-sdio-classes.hwdb
8+
20-bluetooth-vendor-product.hwdb
9+
20-acpi-vendor.hwdb
10+
20-OUI.hwdb
11+
20-net-ifname.hwdb
12+
60-evdev.hwdb
13+
60-keyboard.hwdb
14+
60-sensor.hwdb
15+
70-mouse.hwdb
16+
70-pointingstick.hwdb
17+
70-touchpad.hwdb
2018
'''.split())
2119

2220
if conf.get('ENABLE_HWDB', 0) == 1
23-
install_data(hwdb_files,
24-
install_dir : udevhwdbdir)
21+
install_data(hwdb_files,
22+
install_dir : udevhwdbdir)
2523

26-
meson.add_install_script('sh', '-c',
27-
mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
24+
meson.add_install_script('sh', '-c',
25+
mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
2826

29-
meson.add_install_script('sh', '-c',
30-
'test -n "$DESTDIR" || @0@/systemd-hwdb update'
31-
.format(rootbindir))
27+
meson.add_install_script('sh', '-c',
28+
'test -n "$DESTDIR" || @0@/systemd-hwdb update'
29+
.format(rootbindir))
3230
endif
3331

3432
############################################################
3533

3634
custom_target(
37-
'update',
38-
output : 'update',
39-
command : [hwdb_update_sh, meson.current_source_dir()])
35+
'update',
36+
output : 'update',
37+
command : [hwdb_update_sh, meson.current_source_dir()])

‎man/meson.build‎

Lines changed: 91 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# -*- mode: meson -*-
2-
31
# This is lame, I know, but meson has no other include mechanism
42
subdir('rules')
53

@@ -14,123 +12,122 @@ want_man = want_man != 'false' and xsltproc.found()
1412
want_html = want_html != 'false' and xsltproc.found()
1513

1614
xsltproc_flags = [
17-
'--nonet',
18-
'--xinclude',
19-
'--stringparam', 'man.output.quietly', '1',
20-
'--stringparam', 'funcsynopsis.style', 'ansi',
21-
'--stringparam', 'man.authors.section.enabled', '0',
22-
'--stringparam', 'man.copyright.section.enabled', '0',
23-
'--stringparam', 'systemd.version', '@0@'.format(meson.project_version()),
24-
'--path',
25-
'@0@:@1@'.format(meson.current_build_dir(), meson.current_source_dir())]
15+
'--nonet',
16+
'--xinclude',
17+
'--stringparam', 'man.output.quietly', '1',
18+
'--stringparam', 'funcsynopsis.style', 'ansi',
19+
'--stringparam', 'man.authors.section.enabled', '0',
20+
'--stringparam', 'man.copyright.section.enabled', '0',
21+
'--stringparam', 'systemd.version', '@0@'.format(meson.project_version()),
22+
'--path',
23+
'@0@:@1@'.format(meson.current_build_dir(), meson.current_source_dir())]
2624

2725
custom_man_xsl = files('custom-man.xsl')
2826
custom_html_xsl = files('custom-html.xsl')
27+
xslt_cmd = [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags
2928

3029
custom_entities_ent = configure_file(
31-
input : 'custom-entities.ent.in',
32-
output : 'custom-entities.ent',
33-
configuration : conf)
30+
input : 'custom-entities.ent.in',
31+
output : 'custom-entities.ent',
32+
configuration : conf)
3433

3534
man_pages = []
3635
html_pages = []
3736
source_xml_files = []
3837
foreach tuple : manpages
39-
stem = tuple[0]
40-
section = tuple[1]
41-
aliases = tuple[2]
42-
condition = tuple[3]
43-
44-
xml = stem + '.xml'
45-
html = stem + '.html'
46-
man = stem + '.' + section
47-
48-
manaliases = []
49-
htmlaliases = []
50-
foreach alias : aliases
51-
manaliases += [alias + '.' + section]
52-
htmlaliases += [alias + '.html']
53-
endforeach
54-
55-
mandirn = join_paths(get_option('mandir'), 'man' + section)
56-
57-
have = condition == '' or conf.get(condition, 0) == 1
58-
59-
if have
60-
p1 = custom_target(
61-
man,
62-
input : xml,
63-
output : [man] + manaliases,
64-
command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_man_xsl, '@INPUT@'],
65-
depend_files : custom_entities_ent,
66-
install : want_man,
67-
install_dir : mandirn)
68-
man_pages += [p1]
69-
70-
p2 = custom_target(
71-
html,
72-
input : xml,
73-
output : [html] + htmlaliases,
74-
command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_html_xsl, '@INPUT@'],
75-
depend_files : custom_entities_ent,
76-
install : want_html,
77-
install_dir : join_paths(docdir, 'html'))
78-
html_pages += [p2]
79-
80-
source_xml_files += files(tuple[0] + '.xml')
81-
else
82-
message('Skipping @0@.@1@ because @2@ is @3@'.format(stem, section, condition, have))
83-
endif
38+
stem = tuple[0]
39+
section = tuple[1]
40+
aliases = tuple[2]
41+
condition = tuple[3]
42+
43+
xml = stem + '.xml'
44+
html = stem + '.html'
45+
man = stem + '.' + section
46+
47+
manaliases = []
48+
htmlaliases = []
49+
foreach alias : aliases
50+
manaliases += [alias + '.' + section]
51+
htmlaliases += [alias + '.html']
52+
endforeach
53+
54+
mandirn = join_paths(get_option('mandir'), 'man' + section)
55+
56+
if condition == '' or conf.get(condition, 0) == 1
57+
p1 = custom_target(
58+
man,
59+
input : xml,
60+
output : [man] + manaliases,
61+
command : xslt_cmd + [custom_man_xsl, '@INPUT@'],
62+
depend_files : custom_entities_ent,
63+
install : want_man,
64+
install_dir : mandirn)
65+
man_pages += [p1]
66+
67+
p2 = custom_target(
68+
html,
69+
input : xml,
70+
output : [html] + htmlaliases,
71+
command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
72+
depend_files : custom_entities_ent,
73+
install : want_html,
74+
install_dir : join_paths(docdir, 'html'))
75+
html_pages += [p2]
76+
77+
source_xml_files += files(tuple[0] + '.xml')
78+
else
79+
message('Skipping @0@.@1@ because @2@ is false'.format(stem, section, condition))
80+
endif
8481
endforeach
8582

8683
############################################################
8784

8885
have_lxml = run_command(xml_helper_py).returncode() == 0
8986
if not have_lxml
90-
message('python-lxml not available, not making man page indices')
87+
message('python-lxml not available, not making man page indices')
9188
endif
9289

9390
systemd_directives_xml = custom_target(
94-
'systemd.directives.xml',
95-
input : source_xml_files,
96-
output : 'systemd.directives.xml',
97-
command : [make_directive_index_py, '@OUTPUT@'] + source_xml_files)
91+
'systemd.directives.xml',
92+
input : source_xml_files,
93+
output : 'systemd.directives.xml',
94+
command : [make_directive_index_py, '@OUTPUT@'] + source_xml_files)
9895

9996
nonindex_xml_files = source_xml_files + [systemd_directives_xml]
10097
systemd_index_xml = custom_target(
101-
'systemd.index.xml',
102-
input : nonindex_xml_files,
103-
output : 'systemd.index.xml',
104-
command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files)
98+
'systemd.index.xml',
99+
input : nonindex_xml_files,
100+
output : 'systemd.index.xml',
101+
command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files)
105102

106103
foreach tuple : [['systemd.directives', '7', systemd_directives_xml],
107104
['systemd.index', '7', systemd_index_xml]]
108-
stem = tuple[0]
109-
section = tuple[1]
110-
xml = tuple[2]
111-
112-
html = stem + '.html'
113-
man = stem + '.' + section
114-
115-
mandirn = join_paths(get_option('mandir'), 'man' + section)
116-
117-
p1 = custom_target(
118-
man,
119-
input : xml,
120-
output : man,
121-
command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_man_xsl, '@INPUT@'],
122-
install : want_man and have_lxml,
123-
install_dir : mandirn)
124-
man_pages += [p1]
125-
126-
p2 = custom_target(
127-
html,
128-
input : xml,
129-
output : html,
130-
command : [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags + [custom_html_xsl, '@INPUT@'],
131-
install : want_html and have_lxml,
132-
install_dir : join_paths(docdir, 'html'))
133-
html_pages += [p2]
105+
stem = tuple[0]
106+
section = tuple[1]
107+
xml = tuple[2]
108+
109+
html = stem + '.html'
110+
man = stem + '.' + section
111+
112+
mandirn = join_paths(get_option('mandir'), 'man' + section)
113+
114+
p1 = custom_target(
115+
man,
116+
input : xml,
117+
output : man,
118+
command : xslt_cmd + [custom_man_xsl, '@INPUT@'],
119+
install : want_man and have_lxml,
120+
install_dir : mandirn)
121+
man_pages += [p1]
122+
123+
p2 = custom_target(
124+
html,
125+
input : xml,
126+
output : html,
127+
command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
128+
install : want_html and have_lxml,
129+
install_dir : join_paths(docdir, 'html'))
130+
html_pages += [p2]
134131
endforeach
135132

136133
man = custom_target('man',

0 commit comments

Comments
 (0)