nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Reduce verbosity of meson vars by removing geary_ prefixes

Browse source
This commit is contained in:
Michael Gratton 2020-08-10 16:53:39 +10:00 • committed by Michael James Gratton
parent 2030b2dec7
commit 35683dd6eb
8 changed files with 98 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/client/meson.build
View file

@ -1,16 +1,16 @@
# Geary client # Geary client
geary_client_package_name = 'geary-client' client_package_name = 'geary-client'
geary_client_api_version = '.'.join([ client_api_version = '.'.join([
geary_version.split('.')[0], geary_version.split('.')[0],
geary_version.split('.')[1] geary_version.split('.')[1]
]) ])
geary_client_package = '@0@-@1@'.format( client_package = '@0@-@1@'.format(
geary_client_package_name, client_package_name,
geary_client_api_version client_api_version
) )
geary_client_vala_sources = files( client_vala_sources = files(
'application/application-account-context.vala', 'application/application-account-context.vala',
'application/application-attachment-manager.vala', 'application/application-attachment-manager.vala',
'application/application-avatar-store.vala', 'application/application-avatar-store.vala',
@ -145,12 +145,12 @@ geary_client_vala_sources = files(
'util/util-migrate.vala', 'util/util-migrate.vala',
) )
geary_client_dependencies = [ client_dependencies = [
enchant, enchant,
folks, folks,
gck, gck,
gcr, gcr,
geary_engine_dep, engine_dep,
gee, gee,
gio, gio,
gmime, gmime,
@ -170,32 +170,30 @@ geary_client_dependencies = [
webkit2gtk, webkit2gtk,
] ]
geary_client_vala_args = geary_vala_args
# Enable shared shecondary process if available. # Enable shared shecondary process if available.
# See issues #558 and #559 # See issues #558 and #559
webkit_version = webkit2gtk.version().split('.') webkit_version = webkit2gtk.version().split('.')
if webkit_version[0].to_int() <= 2 and webkit_version[1].to_int() <= 24 if webkit_version[0].to_int() <= 2 and webkit_version[1].to_int() <= 24
message('Enabling WebKitGTK shared process model') message('Enabling WebKitGTK shared process model')
geary_client_vala_args += [ client_vala_args += [
'-D', 'HAS_WEBKIT_SHARED_PROC' '-D', 'HAS_WEBKIT_SHARED_PROC'
] ]
endif endif
# Main client application library # Main client application library
geary_client_lib = shared_library( client_lib = shared_library(
geary_client_package, client_package,
geary_client_vala_sources + geary_resources, client_vala_sources + geary_resources,
dependencies: geary_client_dependencies, dependencies: client_dependencies,
include_directories: config_h_dir, include_directories: config_h_dir,
vala_args: geary_client_vala_args, vala_args: client_vala_args,
c_args: geary_c_args, c_args: geary_c_args,
install: true, install: true,
install_dir: client_lib_dir, install_dir: client_lib_dir,
) )
geary_client_dep = declare_dependency( client_dep = declare_dependency(
link_with: geary_client_lib, link_with: client_lib,
include_directories: include_directories('.'), include_directories: include_directories('.'),
) )

4
src/client/plugin/meson.build
View file

@ -6,8 +6,8 @@
plugin_dependencies = [ plugin_dependencies = [
folks, folks,
gdk, gdk,
geary_client_dep, client_dep,
geary_engine_dep, engine_dep,
gee, gee,
gmime, gmime,
goa, goa,

12
src/console/meson.build
View file

@ -1,18 +1,18 @@
geary_console_sources = files( console_sources = files(
'main.vala', 'main.vala',
) )
geary_console_dependencies = [ console_dependencies = [
gtk, gtk,
gee, gee,
gmime, gmime,
webkit2gtk, webkit2gtk,
geary_engine_dep, engine_dep,
] ]
geary_console = executable('geary-console', console = executable('geary-console',
geary_console_sources, console_sources,
dependencies: geary_console_dependencies, dependencies: console_dependencies,
include_directories: config_h_dir, include_directories: config_h_dir,
vala_args: geary_vala_args, vala_args: geary_vala_args,
c_args: geary_c_args, c_args: geary_c_args,

52
src/engine/meson.build
View file

@ -1,5 +1,5 @@
# Geary engine # Geary engine
geary_engine_vala_sources = files( engine_vala_sources = files(
'api/geary.vala', 'api/geary.vala',
'api/geary-abstract-local-folder.vala', 'api/geary-abstract-local-folder.vala',
'api/geary-account.vala', 'api/geary-account.vala',
@ -312,11 +312,11 @@ geary_engine_vala_sources = files(
'util/util-trillian.vala', 'util/util-trillian.vala',
) )
geary_engine_sources = [ engine_sources = [
geary_engine_vala_sources, engine_vala_sources,
] ]
geary_engine_dependencies = [ engine_dependencies = [
gee, gee,
gio, gio,
glib, glib,
@ -328,46 +328,46 @@ geary_engine_dependencies = [
] ]
if libunwind_dep.found() if libunwind_dep.found()
geary_engine_dependencies += libunwind engine_dependencies += libunwind
endif endif
build_dir = meson.current_build_dir() engine_build_dir = meson.current_build_dir()
# Generate internal VAPI for unit testing. See Meson issue # Generate internal VAPI for unit testing. See Meson issue
# https://github.com/mesonbuild/meson/issues/1781 for official # https://github.com/mesonbuild/meson/issues/1781 for official
# internal VAPI support. # internal VAPI support.
geary_engine_vala_args = geary_vala_args engine_vala_args = geary_vala_args
geary_engine_vala_args += [ engine_vala_args += [
'--internal-header=@0@/geary-engine-internal.h'.format(build_dir), '--internal-header=@0@/geary-engine-internal.h'.format(engine_build_dir),
'--internal-vapi=@0@/geary-engine-internal.vapi'.format(build_dir) '--internal-vapi=@0@/geary-engine-internal.vapi'.format(engine_build_dir)
] ]
if libunwind_dep.found() if libunwind_dep.found()
geary_engine_vala_args += [ engine_vala_args += [
'-D', 'HAVE_LIBUNWIND', '-D', 'HAVE_LIBUNWIND',
] ]
endif endif
if get_option('tnef-support') if get_option('tnef-support')
geary_engine_dependencies += libytnef engine_dependencies += libytnef
geary_engine_vala_args += [ engine_vala_args += [
'-D', 'WITH_TNEF_SUPPORT' '-D', 'WITH_TNEF_SUPPORT'
] ]
endif endif
geary_engine_lib = static_library('geary-engine', engine_lib = static_library('geary-engine',
geary_engine_sources, engine_sources,
dependencies: geary_engine_dependencies, dependencies: engine_dependencies,
include_directories: config_h_dir, include_directories: config_h_dir,
vala_args: geary_engine_vala_args, vala_args: engine_vala_args,
c_args: geary_c_args, c_args: geary_c_args,
) )
# Dummy target to tell Meson about the internal VAPI given the # Dummy target to tell Meson about the internal VAPI given the
# workaround above, and fix the VAPI header to work around # workaround above, and fix the VAPI header to work around
# GNOME/vala#358 # GNOME/vala#358
geary_engine_internal_header_fixup = custom_target( engine_internal_header_fixup = custom_target(
'geary_engine_internal_header_fixup', 'engine_internal_header_fixup',
output: [ output: [
'geary-engine-internal.h', 'geary-engine-internal.h',
'geary-engine-internal.vapi', 'geary-engine-internal.vapi',
@ -378,27 +378,27 @@ geary_engine_internal_header_fixup = custom_target(
's/geary-engine.h/geary-engine-internal.h/g', 's/geary-engine.h/geary-engine-internal.h/g',
'@OUTDIR@/geary-engine-internal.vapi', '@OUTDIR@/geary-engine-internal.vapi',
], ],
depends: geary_engine_lib depends: engine_lib
) )
geary_engine_dep = declare_dependency( engine_dep = declare_dependency(
link_with: [ link_with: [
geary_engine_lib, engine_lib,
sqlite3_unicodesn_lib sqlite3_unicodesn_lib
], ],
include_directories: include_directories('.') include_directories: include_directories('.')
) )
geary_engine_internal_dep = declare_dependency( engine_internal_dep = declare_dependency(
# Can't just include geary_engine_lib in link_with since that will # Can't just include engine_lib in link_with since that will
# pull in the public header and we get duplicate symbol errors. # pull in the public header and we get duplicate symbol errors.
link_args: [ link_args: [
'-L' + build_dir, '-L' + engine_build_dir,
'-lgeary-engine' '-lgeary-engine'
], ],
link_with: [ link_with: [
sqlite3_unicodesn_lib, sqlite3_unicodesn_lib,
], ],
include_directories: include_directories('.'), include_directories: include_directories('.'),
sources: geary_engine_internal_header_fixup sources: engine_internal_header_fixup
) )

12
src/mailer/meson.build
View file

@ -1,17 +1,17 @@
geary_mailer_sources = files( mailer_sources = files(
'main.vala', 'main.vala',
) )
geary_mailer_dependencies = [ mailer_dependencies = [
gee, gee,
gmime, gmime,
webkit2gtk, webkit2gtk,
geary_engine_dep, engine_dep,
] ]
geary_mailer = executable('geary-mailer', mailer = executable('geary-mailer',
geary_mailer_sources, mailer_sources,
dependencies: geary_mailer_dependencies, dependencies: mailer_dependencies,
include_directories: config_h_dir, include_directories: config_h_dir,
vala_args: geary_vala_args, vala_args: geary_vala_args,
c_args: geary_c_args, c_args: geary_c_args,

32
src/meson.build
View file

@ -53,41 +53,41 @@ subdir('client')
subdir('console') subdir('console')
subdir('mailer') subdir('mailer')
geary_web_process_sources = files( web_process_sources = files(
'client/web-process/web-process-extension.vala', 'client/web-process/web-process-extension.vala',
'client/util/util-js.vala', 'client/util/util-js.vala',
) )
# Web process extension library # Web process extension library
geary_web_process = library('geary-web-process', web_process = library('geary-web-process',
geary_web_process_sources, web_process_sources,
dependencies: [ dependencies: [
geary_engine_dep, engine_dep,
gee, gee,
gmime, gmime,
webkit2gtk_web_extension, webkit2gtk_web_extension,
], ],
include_directories: config_h_dir, include_directories: config_h_dir,
vala_args: geary_client_vala_args, vala_args: client_vala_args,
c_args: geary_c_args, c_args: geary_c_args,
install: true, install: true,
install_dir: web_extensions_dir install_dir: web_extensions_dir
) )
# Now finally, make the geary executable # Now finally, make the geary executable
geary_bin_sources = files( bin_sources = files(
'client' / 'application' / 'main.vala', 'client' / 'application' / 'main.vala',
) )
geary_bin_sources += [ bin_sources += [
geary_compiled_schema, geary_compiled_schema,
geary_resources # Included here so they show up in the executable. geary_resources # Included here so they show up in the executable.
] ]
geary_bin_dependencies = [ bin_dependencies = [
folks, folks,
gdk, gdk,
geary_client_dep, client_dep,
geary_engine_dep, engine_dep,
gee, gee,
gmime, gmime,
goa, goa,
@ -100,9 +100,9 @@ geary_bin_dependencies = [
webkit2gtk, webkit2gtk,
] ]
geary_bin = executable('geary', bin = executable('geary',
geary_bin_sources, bin_sources,
dependencies: geary_bin_dependencies, dependencies: bin_dependencies,
vala_args: geary_vala_args, vala_args: geary_vala_args,
c_args: geary_c_args, c_args: geary_c_args,
install: true, install: true,
@ -142,10 +142,10 @@ endforeach
valadoc_dep_args += [ '--pkg', 'posix' ] valadoc_dep_args += [ '--pkg', 'posix' ]
if enable_valadoc if enable_valadoc
geary_docs = custom_target('valadoc', docs = custom_target('valadoc',
build_by_default: true, build_by_default: true,
depends: [geary_client_lib, geary_engine_lib], depends: [client_lib, engine_lib],
input: geary_client_vala_sources + geary_engine_sources, input: client_vala_sources + engine_sources,
output: 'valadoc', output: 'valadoc',
command: [ valadoc, command: [ valadoc,
'--verbose', '--verbose',

2
test/data/meson.build
View file

@ -1,3 +1,3 @@
geary_test_engine_resources = gnome.compile_resources('org.gnome.GearyTest', test_engine_resources = gnome.compile_resources('org.gnome.GearyTest',
files('org.gnome.GearyTest.gresource.xml'), files('org.gnome.GearyTest.gresource.xml'),
) )

50
test/meson.build
View file

@ -17,7 +17,7 @@ libmock_sources = [
'mock/mock-search-query.vala', 'mock/mock-search-query.vala',
] ]
geary_test_engine_sources = [ test_engine_sources = [
'test-case.vala', 'test-case.vala',
'test-server.vala', 'test-server.vala',
'test-engine.vala', 'test-engine.vala',
@ -70,10 +70,10 @@ geary_test_engine_sources = [
'engine/util-string-test.vala', 'engine/util-string-test.vala',
'engine/util-timeout-manager-test.vala', 'engine/util-timeout-manager-test.vala',
geary_test_engine_resources test_engine_resources
] ]
geary_test_client_sources = [ test_client_sources = [
'test-case.vala', 'test-case.vala',
'test-client.vala', 'test-client.vala',
@ -97,7 +97,7 @@ geary_test_client_sources = [
geary_resources geary_resources
] ]
geary_test_integration_sources = [ test_integration_sources = [
'test-case.vala', 'test-case.vala',
'test-integration.vala', 'test-integration.vala',
@ -107,40 +107,40 @@ geary_test_integration_sources = [
# Engine tests # Engine tests
geary_test_engine_dependencies = [ test_engine_dependencies = [
geary_engine_internal_dep, engine_internal_dep,
vala_unit_dep, vala_unit_dep,
] ]
geary_test_engine_dependencies += geary_engine_dependencies test_engine_dependencies += engine_dependencies
geary_test_engine_vala_args = geary_vala_args test_engine_vala_args = geary_vala_args
if get_option('tnef-support') if get_option('tnef-support')
geary_test_engine_dependencies += libytnef test_engine_dependencies += libytnef
geary_test_engine_vala_args += [ test_engine_vala_args += [
'-D', 'WITH_TNEF_SUPPORT' '-D', 'WITH_TNEF_SUPPORT'
] ]
endif endif
geary_test_engine_bin = executable('test-engine', test_engine_bin = executable('test-engine',
geary_test_engine_sources + libmock_sources, test_engine_sources + libmock_sources,
dependencies: geary_test_engine_dependencies, dependencies: test_engine_dependencies,
include_directories: config_h_dir, include_directories: config_h_dir,
vala_args: geary_test_engine_vala_args, vala_args: test_engine_vala_args,
c_args: geary_c_args, c_args: geary_c_args,
) )
# Client tests # Client tests
geary_test_client_dependencies = [ test_client_dependencies = [
geary_client_dep, client_dep,
vala_unit_dep, vala_unit_dep,
] ]
geary_test_client_dependencies += geary_client_dependencies test_client_dependencies += client_dependencies
geary_test_client_bin = executable('test-client', test_client_bin = executable('test-client',
geary_test_client_sources + libmock_sources, test_client_sources + libmock_sources,
dependencies: geary_test_client_dependencies, dependencies: test_client_dependencies,
include_directories: config_h_dir, include_directories: config_h_dir,
vala_args: geary_vala_args, vala_args: geary_vala_args,
c_args: geary_c_args, c_args: geary_c_args,
@ -148,10 +148,10 @@ geary_test_client_bin = executable('test-client',
# Integration tests # Integration tests
geary_test_integration_bin = executable('test-integration', test_integration_bin = executable('test-integration',
geary_test_integration_sources, test_integration_sources,
dependencies: [ dependencies: [
geary_engine_dep, engine_dep,
gee, gee,
gio, gio,
gmime, gmime,
@ -163,5 +163,5 @@ geary_test_integration_bin = executable('test-integration',
c_args: geary_c_args, c_args: geary_c_args,
) )
test('engine-tests', geary_test_engine_bin) test('engine-tests', test_engine_bin)
test('client-tests', geary_test_client_bin) test('client-tests', test_client_bin)