varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-12 16:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Only run gdbus-codegen if building components which need it

Browse Source 
This is to avoid running `gdbus-codegen` when building sysprof as a
subproject underneath libglib, as by that point in the GLib build
process, `gdbus-codegen` is not yet available.

The interfaces generated by these `gdbus-codegen` invocations are only
needed for `sysprofd` and libsysprof, not for the libraries like
`libsysprof-capture`.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall
2020-06-25 15:31:16 +01:00
parent 5d1678974a
commit e03b54fca5
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/meson.build
View File

@ -7,25 +7,25 @@ sysprof_version_conf.set('MINOR_VERSION', sysprof_version[1])
sysprof_version_conf.set('MICRO_VERSION', sysprof_version[2]) sysprof_version_conf.set('MICRO_VERSION', sysprof_version[2])
sysprof_version_conf.set('VERSION', meson.project_version()) sysprof_version_conf.set('VERSION', meson.project_version())
ipc_profiler_src = gnome.gdbus_codegen('ipc-profiler', if get_option('with_sysprofd') == 'bundled' or get_option('libsysprof')
sources: 'org.gnome.Sysprof3.Profiler.xml', ipc_profiler_src = gnome.gdbus_codegen('ipc-profiler',
interface_prefix: 'org.gnome.Sysprof3.', sources: 'org.gnome.Sysprof3.Profiler.xml',
namespace: 'Ipc', interface_prefix: 'org.gnome.Sysprof3.',
) namespace: 'Ipc',
)
ipc_service_src = gnome.gdbus_codegen('ipc-service', ipc_service_src = gnome.gdbus_codegen('ipc-service',
sources: 'org.gnome.Sysprof3.Service.xml', sources: 'org.gnome.Sysprof3.Service.xml',
interface_prefix: 'org.gnome.Sysprof3.', interface_prefix: 'org.gnome.Sysprof3.',
namespace: 'Ipc', namespace: 'Ipc',
) )
ipc_legacy_src = gnome.gdbus_codegen('ipc-legacy', ipc_legacy_src = gnome.gdbus_codegen('ipc-legacy',
sources: 'org.gnome.Sysprof2.xml', sources: 'org.gnome.Sysprof2.xml',
interface_prefix: 'org.gnome.', interface_prefix: 'org.gnome.',
namespace: 'IpcLegacy', namespace: 'IpcLegacy',
) )
if get_option('with_sysprofd') == 'bundled'
install_data(['org.gnome.Sysprof3.Service.xml', install_data(['org.gnome.Sysprof3.Service.xml',
'org.gnome.Sysprof2.xml'], 'org.gnome.Sysprof2.xml'],
install_dir: join_paths(datadir, 'dbus-1/interfaces'), install_dir: join_paths(datadir, 'dbus-1/interfaces'),

14
src/tools/meson.build
View File

@ -28,12 +28,14 @@ sysprof_dump = executable('sysprof-dump', 'sysprof-dump.c',
install: false, install: false,
) )
sysprof_profiler_ctl = executable('sysprof-profiler-ctl', if get_option('with_sysprofd') == 'bundled' or get_option('libsysprof')
[ 'sysprof-profiler-ctl.c', ipc_profiler_src ], sysprof_profiler_ctl = executable('sysprof-profiler-ctl',
dependencies: [ tools_deps, dependency('gio-unix-2.0', version: glib_req_version) ], [ 'sysprof-profiler-ctl.c', ipc_profiler_src ],
c_args: tools_cflags, dependencies: [ tools_deps, dependency('gio-unix-2.0', version: glib_req_version) ],
install: false, c_args: tools_cflags,
) install: false,
)
endif
list_threads = executable('list-threads', ['list-threads.c'], list_threads = executable('list-threads', ['list-threads.c'],
dependencies: [ tools_deps ], dependencies: [ tools_deps ],