applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

project: Update meson files

Browse source 
I probably have OCD. Seeing these files
with this poor alignment gives me physical
pain.
This commit is contained in:
Georges Basile Stavracas Neto 2018-05-03 00:45:29 -03:00
parent 36af5e51d1
commit af0186aaf9
11 changed files with 129 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/icons/meson.build
View file

@ -1,4 +1,4 @@
install_subdir( install_subdir(
'hicolor', 'hicolor',
install_dir: control_center_icondir install_dir : control_center_icondir
) )

12
man/meson.build
View file

@ -17,10 +17,10 @@ xsltproc_cmd = [
output = meson.project_name() + '.1' output = meson.project_name() + '.1'
custom_target( custom_target(
output, output,
input: meson.project_name() + '.xml', input : meson.project_name() + '.xml',
output: output, output : output,
command: xsltproc_cmd, command : xsltproc_cmd,
install: true, install : true,
install_dir: join_paths(control_center_mandir, 'man1') install_dir : join_paths(control_center_mandir, 'man1')
) )

2
meson.build
View file

@ -65,7 +65,6 @@ optimized_src = '''
''' '''
control_center_optimized = get_option('buildtype').contains('optimized') and cc.compiles(optimized_src) control_center_optimized = get_option('buildtype').contains('optimized') and cc.compiles(optimized_src)
message('whether_optimization is enabled: ' + control_center_optimized.to_string())
if control_center_optimized if control_center_optimized
common_flags += '-Wp,-D_FORTIFY_SOURCE=2' common_flags += '-Wp,-D_FORTIFY_SOURCE=2'
@ -282,6 +281,7 @@ output += ' Options \n'
output += ' Documentation .............................. ' + get_option('documentation').to_string() + '\n' output += ' Documentation .............................. ' + get_option('documentation').to_string() + '\n'
output += ' Tracing .................................... ' + enable_tracing.to_string() + '\n' output += ' Tracing .................................... ' + enable_tracing.to_string() + '\n'
output += ' gnome-session libexecdir ................... ' + gnome_session_libexecdir + '\n' output += ' gnome-session libexecdir ................... ' + gnome_session_libexecdir + '\n'
output += ' Optimized .................................. ' + control_center_optimized.to_string() + '\n'
output += ' Panels \n' output += ' Panels \n'
output += ' GNOME Bluetooth (Bluetooth panel) .......... ' + host_is_linux_not_s390.to_string() + '\n' output += ' GNOME Bluetooth (Bluetooth panel) .......... ' + host_is_linux_not_s390.to_string() + '\n'
output += ' Cheese (Users panel webcam support) ........ ' + enable_cheese.to_string() + '\n' output += ' Cheese (Users panel webcam support) ........ ' + enable_cheese.to_string() + '\n'

54
panels/wacom/meson.build
View file

@ -15,19 +15,19 @@ panels_list += cappletname
desktop = 'gnome-@0@-panel.desktop'.format(cappletname) desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
desktop_in = configure_file( desktop_in = configure_file(
input: desktop + '.in.in', input : desktop + '.in.in',
output: desktop + '.in', output : desktop + '.in',
configuration: desktop_conf configuration : desktop_conf
) )
i18n.merge_file( i18n.merge_file(
desktop, desktop,
type: 'desktop', type : 'desktop',
input: desktop_in, input : desktop_in,
output: desktop, output : desktop,
po_dir: po_dir, po_dir : po_dir,
install: true, install : true,
install_dir: control_center_desktopdir install_dir : control_center_desktopdir
) )
common_sources = files( common_sources = files(
@ -62,10 +62,10 @@ resource_data = files(
common_sources += gnome.compile_resources( common_sources += gnome.compile_resources(
'cc-' + cappletname + '-resources', 'cc-' + cappletname + '-resources',
cappletname + '.gresource.xml', cappletname + '.gresource.xml',
source_dir: '.', source_dir : '.',
c_name: 'cc_' + cappletname, c_name : 'cc_' + cappletname,
dependencies: resource_data, dependencies : resource_data,
export: true export : true
) )
sources = common_sources + files( sources = common_sources + files(
@ -82,13 +82,11 @@ incs = [
panels_libs += static_library( panels_libs += static_library(
cappletname + '-properties', cappletname + '-properties',
sources: sources, sources : sources,
include_directories: incs, include_directories : incs,
dependencies: deps, dependencies : deps,
c_args: cflags, c_args : cflags,
link_with: [ link_with : [ libwacom_calibrator ]
libwacom_calibrator
]
) )
name = 'test-wacom' name = 'test-wacom'
@ -96,12 +94,10 @@ name = 'test-wacom'
sources = common_sources + files(name + '.c') sources = common_sources + files(name + '.c')
executable( executable(
name, name,
sources, sources,
include_directories: incs, include_directories : incs,
dependencies: deps, dependencies : deps,
c_args: test_cflags, c_args : test_cflags,
link_with: [ link_with : [ libwacom_calibrator_test ]
libwacom_calibrator_test
]
) )

30
search-provider/meson.build
View file

@ -4,11 +4,11 @@ service_conf.set('libexecdir', control_center_libexecdir)
service = 'org.gnome.ControlCenter.SearchProvider.service' service = 'org.gnome.ControlCenter.SearchProvider.service'
configure_file( configure_file(
input: service + '.in', input : service + '.in',
output: service, output : service,
install: true, install : true,
install_dir: join_paths(control_center_datadir, 'dbus-1', 'services'), install_dir : join_paths(control_center_datadir, 'dbus-1', 'services'),
configuration: service_conf configuration : service_conf
) )
install_data( install_data(
@ -26,8 +26,8 @@ sources = files(
sources += gnome.gdbus_codegen( sources += gnome.gdbus_codegen(
'cc-shell-search-provider-generated', 'cc-shell-search-provider-generated',
'org.gnome.ShellSearchProvider2.xml', 'org.gnome.ShellSearchProvider2.xml',
interface_prefix: 'org.gnome.', interface_prefix : 'org.gnome.',
namespace: 'Cc' namespace : 'Cc'
) )
cflags = '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) cflags = '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
@ -38,12 +38,12 @@ libs = [
] ]
executable( executable(
meson.project_name() + '-search-provider', 'gnome-control-center-search-provider',
sources, sources,
include_directories: top_inc, include_directories : top_inc,
dependencies: shell_deps, dependencies : shell_deps,
c_args: cflags, c_args : cflags,
link_with: libs, link_with : libs,
install: true, install : true,
install_dir: control_center_libexecdir install_dir : control_center_libexecdir
) )

90
shell/meson.build
View file

@ -7,39 +7,39 @@ service_conf.set('bindir', control_center_bindir)
service = 'org.gnome.ControlCenter.service' service = 'org.gnome.ControlCenter.service'
configure_file( configure_file(
input: service + '.in', input : service + '.in',
output: service, output : service,
install: true, install : true,
install_dir: join_paths(control_center_datadir, 'dbus-1', 'services'), install_dir : join_paths(control_center_datadir, 'dbus-1', 'services'),
configuration: service_conf configuration : service_conf
) )
desktop = 'gnome-control-center.desktop' desktop = 'gnome-control-center.desktop'
desktop_in = configure_file( desktop_in = configure_file(
input: desktop + '.in.in', input : desktop + '.in.in',
output: desktop + '.in', output : desktop + '.in',
configuration: desktop_conf configuration : desktop_conf
) )
i18n.merge_file( i18n.merge_file(
desktop, desktop,
type: 'desktop', type : 'desktop',
input: desktop_in, input : desktop_in,
output: desktop, output : desktop,
po_dir: po_dir, po_dir : po_dir,
install: true, install : true,
install_dir: control_center_desktopdir install_dir : control_center_desktopdir
) )
cflags = ['-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)] cflags = ['-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)]
libshell = static_library( libshell = static_library(
'shell', 'shell',
sources: 'cc-shell-model.c', sources : 'cc-shell-model.c',
include_directories: [top_inc, common_inc], include_directories : [top_inc, common_inc],
dependencies: common_deps, dependencies : common_deps,
c_args: cflags c_args : cflags
) )
sources = files( sources = files(
@ -93,30 +93,30 @@ debug_conf.set('BUGREPORT_URL', 'http://bugzilla.gnome.org/enter_bug.cgi?product
debug_conf.set10('ENABLE_TRACING', enable_tracing) debug_conf.set10('ENABLE_TRACING', enable_tracing)
sources += configure_file( sources += configure_file(
input: 'cc-debug.h.in', input : 'cc-debug.h.in',
output: 'cc-debug.h', output : 'cc-debug.h',
configuration: debug_conf configuration : debug_conf
) )
executable( executable(
meson.project_name(), meson.project_name(),
sources, sources,
include_directories: top_inc, include_directories : top_inc,
dependencies: shell_deps, dependencies : shell_deps,
c_args: cflags, c_args : cflags,
link_with: panels_libs + [libshell], link_with : panels_libs + [libshell],
install: true install : true
) )
# Because it is confusing and somewhat problematic to directly add and compile # Because it is confusing and somewhat problematic to directly add and compile
# cc-panel-loader.o by another directory (i.e. the shell search provider), we # cc-panel-loader.o by another directory (i.e. the shell search provider), we
# have to create a library and link it there, just like libshell.la. # have to create a library and link it there, just like libshell.la.
libpanel_loader = static_library( libpanel_loader = static_library(
'panel_loader', 'panel_loader',
sources: 'cc-panel-loader.c', sources : 'cc-panel-loader.c',
include_directories: top_inc, include_directories : top_inc,
dependencies: common_deps, dependencies : common_deps,
c_args: cflags + ['-DCC_PANEL_LOADER_NO_GTYPES'] c_args : cflags + ['-DCC_PANEL_LOADER_NO_GTYPES']
) )
# libshell_test # libshell_test
@ -127,19 +127,21 @@ sources = files(
'cc-object-storage.c', 'cc-object-storage.c',
) )
libtestshell = static_library( libtestshell = static_library(
'testshell', 'testshell',
sources, sources,
include_directories: top_inc, include_directories : top_inc,
dependencies: common_deps + [ libwidgets_dep ], dependencies : common_deps + [ libwidgets_dep ],
c_args: cflags, c_args : cflags,
link_with: panels_libs link_with : panels_libs
) )
libtestshell_dep = declare_dependency( libtestshell_dep = declare_dependency(
include_directories: top_inc, include_directories : top_inc,
link_with: libtestshell link_with : libtestshell
) )
libtestshell_deps = common_deps + [ libwidgets_dep, libtestshell_dep ] libtestshell_deps = common_deps + [ libwidgets_dep, libtestshell_dep ]
install_data ('org.gnome.ControlCenter.gschema.xml', install_data (
install_dir: control_center_schemadir) 'org.gnome.ControlCenter.gschema.xml',
install_dir : control_center_schemadir
)

10
tests/common/meson.build
View file

@ -12,11 +12,11 @@ cflags = [
] ]
exe = executable( exe = executable(
test_unit, test_unit,
sources, sources,
include_directories: [ top_inc, common_inc ], include_directories : [ top_inc, common_inc ],
dependencies: common_deps + [libwidgets_dep], dependencies : common_deps + [libwidgets_dep],
c_args: cflags, c_args : cflags,
) )
test(test_unit, exe) test(test_unit, exe)

14
tests/datetime/meson.build
View file

@ -1,6 +1,6 @@
test_units = [ test_units = [
#'test-timezone', 'test-timezone',
'test-timezone-gfx', 'test-timezone-gfx',
'test-endianess', 'test-endianess',
] ]
@ -13,12 +13,12 @@ cflags = [
foreach unit: test_units foreach unit: test_units
exe = executable( exe = executable(
unit, unit,
[unit + '.c'], [unit + '.c'],
include_directories: includes, include_directories : includes,
dependencies: common_deps + [m_dep], dependencies : common_deps + [m_dep],
link_with: [datetime_panel_lib], link_with : [datetime_panel_lib],
c_args: cflags c_args : cflags
) )
test(unit, exe) test(unit, exe)

12
tests/info/meson.build
View file

@ -8,12 +8,12 @@ cflags = '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir())
foreach unit: test_units foreach unit: test_units
exe = executable( exe = executable(
unit, unit,
[unit + '.c'], [unit + '.c'],
include_directories: includes, include_directories : includes,
dependencies: common_deps, dependencies : common_deps,
link_with: [info_panel_lib], link_with : [info_panel_lib],
c_args: cflags c_args : cflags
) )
test(unit, exe) test(unit, exe)

19
tests/network/meson.build
View file

@ -11,20 +11,21 @@ cflags = [
exe = executable( exe = executable(
'test-network-panel', 'test-network-panel',
['test-network-panel.c', 'cc-test-window.c', 'nm-utils/nm-test-utils-impl.c'], ['test-network-panel.c', 'cc-test-window.c', 'nm-utils/nm-test-utils-impl.c'],
include_directories: includes + [common_inc], include_directories : includes + [common_inc],
dependencies: common_deps + network_manager_deps + [libtestshell_dep], dependencies : common_deps + network_manager_deps + [libtestshell_dep],
link_with: [network_panel_lib], link_with : [network_panel_lib],
c_args: cflags c_args : cflags
) )
envs = [ envs = [
'G_MESSAGES_DEBUG=all', 'G_MESSAGES_DEBUG=all',
'BUILDDIR=' + meson.current_build_dir(), 'BUILDDIR=' + meson.current_build_dir(),
'TOP_BUILDDIR=' + meson.build_root() 'TOP_BUILDDIR=' + meson.build_root()
] ]
test('test-network-panel', test(
'test-network-panel',
find_program('test-network-panel.py'), find_program('test-network-panel.py'),
env: envs, env : envs,
timeout: 10 timeout : 10
) )

12
tests/printers/meson.build
View file

@ -9,12 +9,12 @@ cflags = '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir())
foreach unit: test_units foreach unit: test_units
exe = executable( exe = executable(
unit, unit,
[unit + '.c'], [unit + '.c'],
include_directories: includes, include_directories : includes,
dependencies: common_deps, dependencies : common_deps,
link_with: [printers_panel_lib], link_with : [printers_panel_lib],
c_args: cflags c_args : cflags
) )
test(unit, exe) test(unit, exe)