zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-11 04:43:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

run meson formatter

Browse source
This commit is contained in:
Ailin Nemui 2026-01-25 22:07:44 +01:00
commit 221d520c37
33 changed files with 661 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core/meson.build
View file

@ -3,10 +3,11 @@
if have_capsicum
core_capsicum_source = files('capsicum.c')
else
core_capsicum_source = []
core_capsicum_source = [ ]
endif
libcore_a = static_library('core',
libcore_a = static_library(
'core',
files(
'args.c',
'channels-setup.c',
@ -63,7 +64,8 @@ libcore_a = static_library('core',
def_moduledir,
def_sysconfdir,
],
dependencies : dep)
dependencies : dep,
)
install_headers(
files(
@ -122,4 +124,5 @@ install_headers(
'window-item-def.h',
'write-buffer.h',
),
subdir : incdir / 'src' / 'core')
subdir : incdir / 'src' / 'core',
)

19
src/fe-common/core/meson.build
View file

@ -3,7 +3,7 @@
if have_capsicum
fe_common_core_capsicum_source = files('fe-capsicum.c')
else
fe_common_core_capsicum_source = []
fe_common_core_capsicum_source = [ ]
endif
fe_common_core_sources = [
@ -43,10 +43,11 @@ fe_common_core_sources = [
+ [
default_theme_h,
irssi_version_h,
]
],
]
libfe_common_core_a = static_library('fe_common_core',
libfe_common_core_a = static_library(
'fe_common_core',
fe_common_core_sources,
include_directories : rootinc,
implicit_include_directories : false,
@ -54,10 +55,12 @@ libfe_common_core_a = static_library('fe_common_core',
def_helpdir,
def_themesdir,
],
dependencies : dep)
dependencies : dep,
)
if want_fuzzer
libfuzzer_fe_common_core_a = static_library('fuzzer_fe_common_core',
libfuzzer_fe_common_core_a = static_library(
'fuzzer_fe_common_core',
fe_common_core_sources,
include_directories : rootinc,
implicit_include_directories : false,
@ -66,7 +69,8 @@ if want_fuzzer
def_themesdir,
def_suppress_printf_fallback,
],
dependencies : dep)
dependencies : dep,
)
endif
install_headers(
@ -96,4 +100,5 @@ install_headers(
'window-items.h',
'windows-layout.h',
),
subdir : incdir / 'src' / 'fe-common' / 'core')
subdir : incdir / 'src' / 'fe-common' / 'core',
)

15
src/fe-common/irc/dcc/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
libfe_irc_dcc_a = static_library('fe_irc_dcc',
libfe_irc_dcc_a = static_library(
'fe_irc_dcc',
files(
'fe-dcc-chat-messages.c',
'fe-dcc-chat.c',
@ -16,14 +17,17 @@ libfe_irc_dcc_a = static_library('fe_irc_dcc',
def_helpdir,
def_sysconfdir,
],
dependencies : dep)
shared_library('fe_irc_dcc',
dependencies : dep,
)
shared_library(
'fe_irc_dcc',
name_suffix : module_suffix,
install : true,
install_dir : moduledir,
link_with : dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main,
link_whole : libfe_irc_dcc_a,
override_options : ['b_lundef=false'])
override_options : [ 'b_lundef=false' ],
)
install_headers(
files(
@ -31,4 +35,5 @@ install_headers(
'module-formats.h',
'module.h',
),
subdir : incdir / 'src' / 'fe-common' / 'irc' / 'dcc')
subdir : incdir / 'src' / 'fe-common' / 'irc' / 'dcc',
)

15
src/fe-common/irc/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
libfe_common_irc_a = static_library('fe_common_irc',
libfe_common_irc_a = static_library(
'fe_common_irc',
files(
'fe-cap.c',
'fe-common-irc.c',
@ -27,14 +28,17 @@ libfe_common_irc_a = static_library('fe_common_irc',
def_helpdir,
def_themesdir,
],
dependencies : dep)
shared_library('fe_common_irc',
dependencies : dep,
)
shared_library(
'fe_common_irc',
name_suffix : module_suffix,
install : true,
install_dir : moduledir,
link_with : dl_cross_irc_core + dl_cross_irssi_main,
link_whole : libfe_common_irc_a,
override_options : ['b_lundef=false'])
override_options : [ 'b_lundef=false' ],
)
install_headers(
files(
@ -43,7 +47,8 @@ install_headers(
'module-formats.h',
'module.h',
),
subdir : incdir / 'src' / 'fe-common' / 'irc')
subdir : incdir / 'src' / 'fe-common' / 'irc',
)
subdir('dcc')
subdir('notifylist')

15
src/fe-common/irc/notifylist/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
libfe_irc_notifylist_a = static_library(
'fe_irc_notifylist',
files(
'fe-notifylist.c',
'module-formats.c',
@ -11,18 +12,22 @@ libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
def_helpdir,
def_sysconfdir,
],
dependencies : dep)
shared_library('fe_irc_notifylist',
dependencies : dep,
)
shared_library(
'fe_irc_notifylist',
name_suffix : module_suffix,
install : true,
install_dir : moduledir,
link_with : dl_cross_irc_notifylist + dl_cross_irssi_main,
link_whole : libfe_irc_notifylist_a,
override_options : ['b_lundef=false'])
override_options : [ 'b_lundef=false' ],
)
install_headers(
files(
'module-formats.h',
'module.h',
),
subdir : incdir / 'src' / 'fe-common' / 'irc' / 'notifylist')
subdir : incdir / 'src' / 'fe-common' / 'irc' / 'notifylist',
)

7
src/fe-fuzz/fe-common/core/meson.build
View file

@ -1,5 +1,6 @@
# this file is part of irssi
executable('theme-load-fuzz',
executable(
'theme-load-fuzz',
files(
'../../null-logger.c',
'theme-load.c',
@ -10,12 +11,12 @@ executable('theme-load-fuzz',
libcore_a,
libfuzzer_fe_common_core_a,
],
link_args : [fuzzer_lib],
link_args : [ fuzzer_lib ],
link_language : fuzzer_link_language,
include_directories : rootinc,
implicit_include_directories : false,
install : true,
dependencies : dep
dependencies : dep,
)
# noinst_headers = files(

7
src/fe-fuzz/irc/core/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
executable('event-get-params-fuzz',
executable(
'event-get-params-fuzz',
files(
'../../null-logger.c',
'event-get-params.c',
@ -12,12 +13,12 @@ executable('event-get-params-fuzz',
libirc_core_a,
libfuzzer_fe_common_core_a,
],
link_args : [fuzzer_lib],
link_args : [ fuzzer_lib ],
link_language : fuzzer_link_language,
include_directories : rootinc,
implicit_include_directories : false,
install : true,
dependencies : dep
dependencies : dep,
)
# noinst_headers = files(

14
src/fe-fuzz/meson.build
View file

@ -3,7 +3,8 @@
subdir('irc')
subdir('fe-common')
executable('irssi-fuzz',
executable(
'irssi-fuzz',
files(
'null-logger.c',
'irssi.c',
@ -14,15 +15,16 @@ executable('irssi-fuzz',
libcore_a,
libfuzzer_fe_common_core_a,
],
link_args : [fuzzer_lib],
link_args : [ fuzzer_lib ],
link_language : fuzzer_link_language,
include_directories : rootinc,
implicit_include_directories : false,
install : true,
dependencies : dep
dependencies : dep,
)
executable('server-fuzz',
executable(
'server-fuzz',
files(
'null-logger.c',
'server.c',
@ -37,12 +39,12 @@ executable('server-fuzz',
libfe_irc_dcc_a,
libfe_irc_notifylist_a,
],
link_args : [fuzzer_lib],
link_args : [ fuzzer_lib ],
link_language : fuzzer_link_language,
include_directories : rootinc,
implicit_include_directories : false,
install : true,
dependencies : dep
dependencies : dep,
)
# noinst_headers = files(

5
src/fe-none/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
fe_none_irssi = executable('botti',
fe_none_irssi = executable(
'botti',
files(
'irssi.c',
),
@ -13,7 +14,7 @@ fe_none_irssi = executable('botti',
libcore_a,
],
install : true,
dependencies : dep
dependencies : dep,
)
if need_dl_cross_link_main
dl_cross_irssi_main = [ fe_none_irssi ]

11
src/fe-text/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
fe_text_irssi = executable('irssi',
fe_text_irssi = executable(
'irssi',
files(
#### terminfo_sources ####
'term-terminfo.c',
@ -40,10 +41,9 @@ fe_text_irssi = executable('irssi',
libconfig_a,
libcore_a,
libfe_common_core_a,
],
],
install : true,
dependencies : dep
+ textui_dep
dependencies : dep + textui_dep,
)
if need_dl_cross_link_main
dl_cross_irssi_main = [ fe_text_irssi ]
@ -61,7 +61,8 @@ install_headers(
'textbuffer-view.h',
'textbuffer.h',
),
subdir : incdir / 'src' / 'fe-text')
subdir : incdir / 'src' / 'fe-text',
)
# noinst_headers = files(
# 'gui-entry.h',

17
src/irc/core/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
libirc_core_a = static_library('irc_core',
libirc_core_a = static_library(
'irc_core',
files(
'bans.c',
'channel-events.c',
@ -38,16 +39,19 @@ libirc_core_a = static_library('irc_core',
def_moduledir,
def_sysconfdir,
],
dependencies : dep)
libirc_core_sm = shared_library('irc_core',
dependencies : dep,
)
libirc_core_sm = shared_library(
'irc_core',
name_suffix : module_suffix,
install : true,
install_dir : moduledir,
link_whole : libirc_core_a,
link_with : dl_cross_irssi_main,
override_options : ['b_lundef=false'])
override_options : [ 'b_lundef=false' ],
)
dl_cross_irc_core = []
dl_cross_irc_core = [ ]
if need_dl_cross_link
dl_cross_irc_core += libirc_core_sm
endif
@ -77,4 +81,5 @@ install_headers(
'servers-idle.h',
'servers-redirect.h',
),
subdir : incdir / 'src' / 'irc' / 'core')
subdir : incdir / 'src' / 'irc' / 'core',
)

11
src/irc/dcc/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
libirc_dcc_sm = shared_library('irc_dcc',
libirc_dcc_sm = shared_library(
'irc_dcc',
files(
'dcc-autoget.c',
'dcc-chat.c',
@ -18,9 +19,10 @@ libirc_dcc_sm = shared_library('irc_dcc',
install_dir : moduledir,
link_with : dl_cross_irc_core + dl_cross_irssi_main,
dependencies : dep,
override_options : ['b_lundef=false'])
override_options : [ 'b_lundef=false' ],
)
dl_cross_irc_dcc = []
dl_cross_irc_dcc = [ ]
if need_dl_cross_link
dl_cross_irc_dcc += libirc_dcc_sm
endif
@ -38,4 +40,5 @@ install_headers(
'dcc.h',
'module.h',
),
subdir : incdir / 'src' / 'irc' / 'dcc')
subdir : incdir / 'src' / 'irc' / 'dcc',
)

15
src/irc/flood/meson.build
View file

@ -1,21 +1,26 @@
# this file is part of irssi
libirc_flood_a = static_library('irc_flood',
libirc_flood_a = static_library(
'irc_flood',
files(
'autoignore.c',
'flood.c',
),
include_directories : rootinc,
implicit_include_directories : false,
dependencies : dep)
shared_library('irc_flood',
dependencies : dep,
)
shared_library(
'irc_flood',
name_suffix : module_suffix,
install : true,
install_dir : moduledir,
link_with : dl_cross_irc_core + dl_cross_irssi_main,
link_whole : libirc_flood_a,
override_options : ['b_lundef=false'])
override_options : [ 'b_lundef=false' ],
)
install_headers(
files('module.h'),
subdir : incdir / 'src' / 'irc' / 'flood')
subdir : incdir / 'src' / 'irc' / 'flood',
)

11
src/irc/notifylist/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
libirc_notifylist_sm = shared_library('irc_notifylist',
libirc_notifylist_sm = shared_library(
'irc_notifylist',
files(
'notify-commands.c',
'notify-ison.c',
@ -15,9 +16,10 @@ libirc_notifylist_sm = shared_library('irc_notifylist',
install_dir : moduledir,
link_with : dl_cross_irc_core + dl_cross_irssi_main,
dependencies : dep,
override_options : ['b_lundef=false'])
override_options : [ 'b_lundef=false' ],
)
dl_cross_irc_notifylist = []
dl_cross_irc_notifylist = [ ]
if need_dl_cross_link
dl_cross_irc_notifylist += libirc_notifylist_sm
endif
@ -28,4 +30,5 @@ install_headers(
'notify-setup.h',
'notifylist.h',
),
subdir : incdir / 'src' / 'irc' / 'notifylist')
subdir : incdir / 'src' / 'irc' / 'notifylist',
)

5
src/irc/proxy/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
shared_library('irc_proxy',
shared_library(
'irc_proxy',
files(
'dump.c',
'listen.c',
@ -13,7 +14,7 @@ shared_library('irc_proxy',
install : true,
install_dir : moduledir,
dependencies : dep,
override_options : ['b_lundef=false'],
override_options : [ 'b_lundef=false' ],
)
# noinst_headers = files(

9
src/lib-config/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
libconfig_a = static_library('irssi_config',
libconfig_a = static_library(
'irssi_config',
files(
'get.c',
'parse.c',
@ -9,11 +10,13 @@ libconfig_a = static_library('irssi_config',
),
include_directories : rootinc,
implicit_include_directories : false,
dependencies : dep)
dependencies : dep,
)
install_headers(
files(
'iconfig.h',
'module.h',
),
subdir : incdir / 'src' / 'lib-config')
subdir : incdir / 'src' / 'lib-config',
)

7
src/meson.build
View file

@ -24,7 +24,6 @@ if want_fuzzer
endif
install_headers(
files(
'common.h'
),
subdir : incdir / 'src')
files('common.h'),
subdir : incdir / 'src',
)

5
src/otr/meson.build
View file

@ -1,6 +1,7 @@
# this file is part of irssi
shared_library('otr_core',
shared_library(
'otr_core',
files(
'key.c',
'otr-fe.c',
@ -15,7 +16,7 @@ shared_library('otr_core',
install : true,
install_dir : moduledir,
dependencies : dep,
override_options : ['b_lundef=false'],
override_options : [ 'b_lundef=false' ],
)
# noinst_headers = files(

40
src/perl/common/meson.build
View file

@ -1,20 +1,22 @@
shared_library('Irssi',
[ xsubpp.process(
files(
'Channel.xs',
'Core.xs',
'Expando.xs',
'Ignore.xs',
'Irssi.xs',
'Log.xs',
'Masks.xs',
'Query.xs',
'Rawlog.xs',
'Server.xs',
'Settings.xs',
)
) ]
shared_library(
'Irssi',
[
xsubpp.process(
files(
'Channel.xs',
'Core.xs',
'Expando.xs',
'Ignore.xs',
'Irssi.xs',
'Log.xs',
'Masks.xs',
'Query.xs',
'Rawlog.xs',
'Server.xs',
'Settings.xs',
)
),
]
+ files(
'module.h',
)
@ -27,7 +29,7 @@ shared_library('Irssi',
implicit_include_directories : true,
dependencies : dep + [ perl_dep ],
link_with : dl_cross_perl_core + dl_cross_irssi_main,
override_options : ['b_lundef=false'],
override_options : [ 'b_lundef=false' ],
)
install_headers(
@ -36,6 +38,6 @@ install_headers(
),
install_dir : perlmoddir,
)
# 'Makefile.PL.in',
# 'typemap',

62
src/perl/irc/meson.build
View file

@ -1,21 +1,23 @@
shared_library('Irc',
[ xsubpp.process(
files(
'Channel.xs',
'Client.xs',
'Ctcp.xs',
'Irc.xs',
'Modes.xs',
'Netsplit.xs',
'Notifylist.xs',
'Query.xs',
'Server.xs',
shared_library(
'Irc',
[
xsubpp.process(
files(
'Channel.xs',
'Client.xs',
'Ctcp.xs',
'Irc.xs',
'Modes.xs',
'Netsplit.xs',
'Notifylist.xs',
'Query.xs',
'Server.xs',
),
extra_args : [
'-typemap', '../common/typemap',
],
),
extra_args : [
'-typemap',
'../common/typemap',
],
) ]
]
+ files(
'module.h',
),
@ -27,7 +29,7 @@ shared_library('Irc',
implicit_include_directories : true,
dependencies : dep + [ perl_dep ],
link_with : dl_cross_perl_core + dl_cross_irc_notifylist + dl_cross_irc_core + dl_cross_irssi_main,
override_options : ['b_lundef=false'],
override_options : [ 'b_lundef=false' ],
)
install_headers(
@ -37,16 +39,18 @@ install_headers(
install_dir : perlmoddir / 'Irssi',
)
shared_library('Dcc',
[ xsubpp.process(
files(
'Dcc.xs',
shared_library(
'Dcc',
[
xsubpp.process(
files(
'Dcc.xs',
),
extra_args : [
'-typemap', '../common/typemap',
],
),
extra_args : [
'-typemap',
'../common/typemap',
],
) ]
]
+ files(
'module.h',
),
@ -58,7 +62,7 @@ shared_library('Dcc',
implicit_include_directories : true,
dependencies : dep + [ perl_dep ],
link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main,
override_options : ['b_lundef=false'],
override_options : [ 'b_lundef=false' ],
)
install_headers(
@ -67,6 +71,6 @@ install_headers(
),
install_dir : perlmoddir / 'Irssi' / 'Irc',
)
# 'Makefile.PL.in',
# 'typemap',

29
src/perl/meson.build
View file

@ -1,32 +1,36 @@
perl_signals_list_h = custom_target('perl-signals-list.h',
perl_signals_list_h = custom_target(
'perl-signals-list.h',
input : files('../../docs/signals.txt'),
output : 'perl-signals-list.h',
capture : true,
depend_files : files('get-signals.pl'),
command : [build_perl, files('get-signals.pl'), '@INPUT@'],
command : [ build_perl, files('get-signals.pl'), '@INPUT@' ],
)
irssi_core_pl_h = custom_target('irssi-core.pl.h',
irssi_core_pl_h = custom_target(
'irssi-core.pl.h',
input : files('irssi-core.pl'),
output : 'irssi-core.pl.h',
capture : true,
command : [file2header, '@INPUT@', 'irssi_core_code'],
command : [ file2header, '@INPUT@', 'irssi_core_code' ],
)
# required as of Meson 0.58.0
generated_files_inc = include_directories('.')
libperl_core_sm = shared_library('perl_core',
libperl_core_sm = shared_library(
'perl_core',
files(
'perl-common.c',
'perl-core.c',
'perl-signals.c',
'perl-sources.c',
) + [
)
+ [
irssi_core_pl_h,
perl_signals_list_h,
] + built_src,
]
+ built_src,
c_args : [
def_scriptdir,
def_perl_use_lib,
@ -39,16 +43,17 @@ libperl_core_sm = shared_library('perl_core',
install_rpath : perl_rpath,
build_rpath : perl_rpath,
dependencies : dep_cflagsonly + [ perl_dep ] + dl_cross_dep,
override_options : ['b_asneeded=false', 'b_lundef=false'],
override_options : [ 'b_asneeded=false', 'b_lundef=false' ],
link_with : dl_cross_irssi_main,
)
dl_cross_perl_core = []
dl_cross_perl_core = [ ]
if need_dl_cross_link
dl_cross_perl_core += libperl_core_sm
endif
shared_library('fe_perl',
shared_library(
'fe_perl',
files(
'module-formats.c',
'perl-fe.c',
@ -63,7 +68,7 @@ shared_library('fe_perl',
install_dir : moduledir,
dependencies : dep,
link_with : dl_cross_perl_core + dl_cross_irssi_main,
override_options : ['b_lundef=false'],
override_options : [ 'b_lundef=false' ],
)
subdir('common')

33
src/perl/textui/meson.build
View file

@ -1,18 +1,19 @@
shared_library('TextUI',
[ xsubpp.process(
files(
'Statusbar.xs',
'TextBufferView.xs',
'TextBuffer.xs',
'TextUI.xs',
shared_library(
'TextUI',
[
xsubpp.process(
files(
'Statusbar.xs',
'TextBufferView.xs',
'TextBuffer.xs',
'TextUI.xs',
),
extra_args : [
'-typemap', '../common/typemap',
'-typemap', '../ui/typemap',
],
),
extra_args : [
'-typemap',
'../common/typemap',
'-typemap',
'../ui/typemap',
],
) ]
]
+ files(
'module.h',
),
@ -24,7 +25,7 @@ shared_library('TextUI',
implicit_include_directories : true,
dependencies : dep + [ perl_dep ],
link_with : dl_cross_perl_core + dl_cross_irssi_main,
override_options : ['b_lundef=false'],
override_options : [ 'b_lundef=false' ],
)
install_headers(
@ -33,6 +34,6 @@ install_headers(
),
install_dir : perlmoddir / 'Irssi',
)
# 'Makefile.PL.in',
# 'typemap',

30
src/perl/ui/meson.build
View file

@ -1,16 +1,18 @@
shared_library('UI',
[ xsubpp.process(
files(
'Formats.xs',
'Themes.xs',
'UI.xs',
'Window.xs',
shared_library(
'UI',
[
xsubpp.process(
files(
'Formats.xs',
'Themes.xs',
'UI.xs',
'Window.xs',
),
extra_args : [
'-typemap', '../common/typemap',
],
),
extra_args : [
'-typemap',
'../common/typemap',
],
) ]
]
+ files(
'module.h',
),
@ -22,7 +24,7 @@ shared_library('UI',
implicit_include_directories : true,
dependencies : dep + [ perl_dep ],
link_with : dl_cross_perl_core + dl_cross_irssi_main,
override_options : ['b_lundef=false'],
override_options : [ 'b_lundef=false' ],
)
install_headers(
@ -31,6 +33,6 @@ install_headers(
),
install_dir : perlmoddir / 'Irssi',
)
# 'Makefile.PL.in',
# 'typemap',