Mon, 18 Oct 2021 01:47:59 -0500
Enable structured logging in libpurple
And add log domains where missing.
Testing Done:
Compile only
Reviewed at https://reviews.imfreedom.org/r/1061/
|
40681
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
1 | ZEPHYR_INTERNAL_SOURCES = [ |
|
38456
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
2 | 'ZAsyncLocate.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
3 | 'ZCkAuth.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
4 | 'ZCkIfNot.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
5 | 'ZClosePort.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
6 | 'ZCmpUID.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
7 | 'ZCmpUIDP.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
8 | 'ZFlsLocs.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
9 | 'ZFlsSubs.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
10 | 'ZFmtAuth.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
11 | 'ZFmtList.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
12 | 'ZFmtNotice.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
13 | 'ZFmtRaw.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
14 | 'ZFmtRawLst.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
15 | 'ZFmtSmRaw.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
16 | 'ZFreeNot.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
17 | 'ZGetLocs.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
18 | 'ZGetSender.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
19 | 'ZGetSubs.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
20 | 'ZGetWGPort.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
21 | 'ZIfNotice.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
22 | 'ZInit.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
23 | 'ZLocations.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
24 | 'ZMakeAscii.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
25 | 'ZMkAuth.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
26 | 'ZNewLocU.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
27 | 'ZOpenPort.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
28 | 'ZParseNot.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
29 | 'ZPeekNot.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
30 | 'ZPeekPkt.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
31 | 'ZPending.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
32 | 'ZReadAscii.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
33 | 'ZRecvNot.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
34 | 'ZRecvPkt.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
35 | 'ZRetSubs.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
36 | 'ZSendList.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
37 | 'ZSendNot.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
38 | 'ZSendPkt.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
39 | 'ZSetDest.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
40 | 'ZSubs.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
41 | 'ZVariables.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
42 | 'ZWait4Not.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
43 | 'ZhmStat.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
44 | 'Zinternal.c', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
45 | 'mit-copyright.h', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
46 | 'mit-sipb-copyright.h', |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
47 | 'zephyr_err.h', |
|
40681
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
48 | 'zephyr_internal.h' |
|
38456
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
49 | ] |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
50 | |
|
40681
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
51 | ZEPHYR_SOURCES = [ |
|
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
52 | 'internal.h', |
|
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
53 | 'sysdep.h', |
|
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
54 | 'zephyr.c', |
|
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
55 | 'zephyr.h', |
|
40750
e87c321f05fa
Move tzc and zeph02 to own modules and some cleanup
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40681
diff
changeset
|
56 | 'zephyr_account.h', |
|
40681
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
57 | 'zephyr_html.c', |
|
40750
e87c321f05fa
Move tzc and zeph02 to own modules and some cleanup
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40681
diff
changeset
|
58 | 'zephyr_html.h', |
|
e87c321f05fa
Move tzc and zeph02 to own modules and some cleanup
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40681
diff
changeset
|
59 | 'zephyr_tzc.c', |
|
e87c321f05fa
Move tzc and zeph02 to own modules and some cleanup
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40681
diff
changeset
|
60 | 'zephyr_tzc.h', |
|
e87c321f05fa
Move tzc and zeph02 to own modules and some cleanup
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40681
diff
changeset
|
61 | 'zephyr_zeph02.c', |
|
e87c321f05fa
Move tzc and zeph02 to own modules and some cleanup
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40681
diff
changeset
|
62 | 'zephyr_zeph02.h', |
|
40681
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
63 | ] |
|
38456
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
64 | |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
65 | extdep = krb4 |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
66 | if EXTERNAL_LIBZEPHYR |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
67 | extdep = ext_zephyr |
|
40681
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
68 | else |
|
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
69 | ZEPHYR_SOURCES += ZEPHYR_INTERNAL_SOURCES |
|
38456
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
70 | endif |
|
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
71 | |
|
39404
dc8c71a301d0
libpurple: Drop capability to statically build prpls
Mike Ruprecht <cmaiku@gmail.com>
parents:
38854
diff
changeset
|
72 | if DYNAMIC_ZEPHYR |
|
41075
94a357cfec6c
move the zephyr protocol plugins icons to a resource in the plugin
Gary Kramlich <grim@reaperworld.com>
parents:
41066
diff
changeset
|
73 | zephyr_resources = gnome.compile_resources('zephyrresource', |
|
94a357cfec6c
move the zephyr protocol plugins icons to a resource in the plugin
Gary Kramlich <grim@reaperworld.com>
parents:
41066
diff
changeset
|
74 | 'resources/zephyr.gresource.xml', |
|
94a357cfec6c
move the zephyr protocol plugins icons to a resource in the plugin
Gary Kramlich <grim@reaperworld.com>
parents:
41066
diff
changeset
|
75 | source_dir : 'resources', |
|
94a357cfec6c
move the zephyr protocol plugins icons to a resource in the plugin
Gary Kramlich <grim@reaperworld.com>
parents:
41066
diff
changeset
|
76 | c_name : 'zephyr') |
|
94a357cfec6c
move the zephyr protocol plugins icons to a resource in the plugin
Gary Kramlich <grim@reaperworld.com>
parents:
41066
diff
changeset
|
77 | ZEPHYR_SOURCES += zephyr_resources |
|
94a357cfec6c
move the zephyr protocol plugins icons to a resource in the plugin
Gary Kramlich <grim@reaperworld.com>
parents:
41066
diff
changeset
|
78 | |
|
40681
675b8605dca2
Move zephyr<->html conversion to own module
Arkadiy Illarionov <qarkai@gmail.com>
parents:
40624
diff
changeset
|
79 | zephyr_prpl = shared_library('zephyr', ZEPHYR_SOURCES, |
|
41107
1570d8844e9a
Enable structured logging in libpurple
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41075
diff
changeset
|
80 | c_args : ['-Dlint', '-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-Zephyr"'], |
|
38458
e665653856ab
meson: Make libpurple into a dependency object.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38456
diff
changeset
|
81 | dependencies : [extdep, libpurple_dep, glib], |
|
38456
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
82 | install : true, install_dir : PURPLE_PLUGINDIR) |
|
41066
00e6bda3ef95
Add a Meson devenv configuration.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40750
diff
changeset
|
83 | |
|
00e6bda3ef95
Add a Meson devenv configuration.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40750
diff
changeset
|
84 | devenv.append('PURPLE_PLUGIN_PATH', meson.current_build_dir()) |
|
38456
43e01a578957
Add zephyr to meson build.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
diff
changeset
|
85 | endif |