jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e meson build - refactor and clean up config and some module only cfg 

config that is only needed fro modules only needs to be don in the
modules subdir meson.build... i tried doing what modules do but output
files cant have paths.
This commit is contained in:
Carsten Haitzler 2017-08-10 20:22:55 +09:00
parent bcf0110277
commit c80766dfa2
7 changed files with 125 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
config/default/meson.build
View File

@ -1,19 +1,22 @@
config_default = ['e.src', 'e_bindings.src'] dir = 'default'
config_default_output = ['e.cfg', 'e_bindings.cfg'] src = [
'e',
'e_bindings'
]
config_dist_default = ['enlightenment-default.png', 'profile.desktop'] ##### boilerplate config build + install of icons/dirs
i = 0 i = 0
foreach cd: config_default foreach cd: src
custom_target(' '.join(['config_dist_default', cd]), custom_target(' '.join(['config_dist', dir, cd]),
input: cd, input : cd + '.src',
command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], output : cd + '.cfg',
output: config_default_output[i], command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
install: true, install : true,
install_dir: join_paths(dir_config, 'default') install_dir: join_paths(dir_config, dir)
) )
i += 1 i += 1
endforeach endforeach
foreach cd: config_default_output foreach cd: src
out = join_paths(dir_config, 'default', cd) o = join_paths(dir_config, dir, cd + '.cfg')
meson.add_install_script(chmod, 'a+r', out) meson.add_install_script(chmod, 'a+r', o)
endforeach endforeach

17
config/meson.build
View File

@ -1,12 +1,17 @@
dir_config = join_paths(dir_data, 'enlightenment/data/config') dir_config = join_paths(dir_data, 'enlightenment/data/config')
eet = find_program('eet')
gen_eet = generator(eet,
output : '@BASENAME@.cfg',
arguments: ['-e', '@OUTPUT@', 'config', '@INPUT@', '1'])
custom_target('profile.src', custom_target('profile.src',
input: 'profile.src', input : 'profile.src',
command: [eet, '-i', '@OUTPUT@', 'config', '@INPUT@', '1'], command : [eet, '-i', '@OUTPUT@', 'config', '@INPUT@', '1'],
output: ['profile.cfg'], output : ['profile.cfg'],
install: true, install : true,
install_dir: dir_config install_dir: dir_config
) )
out = join_paths(dir_config, 'profile.cfg') out = join_paths(dir_config, 'profile.cfg')
meson.add_install_script(chmod, 'a+r', out) meson.add_install_script(chmod, 'a+r', out)

44
config/mobile/meson.build
View File

@ -1,23 +1,29 @@
config_mobile = ['e.src', 'e_bindings.src', 'module.battery.src', 'module.conf.src'] dir='mobile'
config_mobile_output = ['e.cfg', 'e_bindings.cfg', 'module.battery.cfg', 'module.conf.cfg'] src = [
'e',
'e_bindings',
'module.battery',
'module.conf'
]
##### boilerplate config build + install of icons/dirs
i = 0 i = 0
foreach cd: config_mobile foreach cd: src
custom_target(' '.join(['config_dist_mobile', cd]), custom_target(' '.join(['config_dist', dir, cd]),
input: cd, input : cd + '.src',
command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], output : cd + '.cfg',
output: config_mobile_output[i], command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
install: true, install : true,
install_dir: join_paths(dir_config, 'mobile') install_dir: join_paths(dir_config, dir)
) )
i += 1 i += 1
endforeach endforeach
install_data([ 'enlightenment-' + dir + '.png',
config_dist_mobile = ['enlightenment-mobile.png', 'profile.desktop'] 'profile.desktop'
install_data(config_dist_mobile, ],
install_dir: join_paths(dir_config, 'mobile') install_dir: join_paths(dir_config, dir)
) )
foreach cd: config_mobile_output foreach cd: src
out = join_paths(dir_config, 'mobile', cd) o = join_paths(dir_config, dir, cd + '.cfg')
meson.add_install_script(chmod, 'a+r', out) meson.add_install_script(chmod, 'a+r', o)
endforeach endforeach

67
config/standard/meson.build
View File

@ -1,42 +1,35 @@
config_standard = ['e.src', 'e_bindings.src', dir = 'standard'
'module.battery.src', src = [
'module.cpufreq.src', 'e',
'module.fileman.src', 'e_bindings',
'module.ibar.src', 'module.battery',
'module.ibox.src', 'module.cpufreq',
'module.pager.src', 'module.fileman',
'module.temperature.src', 'module.ibar',
'module.conf.src' 'module.ibox',
] 'module.pager',
'module.temperature',
config_standard_output = ['e.cfg', 'e_bindings.cfg', 'module.conf'
'module.battery.cfg',
'module.cpufreq.cfg',
'module.fileman.cfg',
'module.ibar.cfg',
'module.ibox.cfg',
'module.pager.cfg',
'module.temperature.cfg',
'module.conf.cfg'
] ]
##### boilerplate config build + install of icons/dirs
i = 0 i = 0
foreach cd: config_standard foreach cd: src
custom_target(' '.join(['config_dist_standard', cd]), custom_target(' '.join(['config_dist', dir, cd]),
input: cd, input : cd + '.src',
command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], output : cd + '.cfg',
output: config_standard_output[i], command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
install: true, install : true,
install_dir: join_paths(dir_config, 'standard') install_dir: join_paths(dir_config, dir)
) )
i += 1 i += 1
endforeach endforeach
install_data([ 'enlightenment-' + dir + '.png',
config_dist_standard = ['enlightenment-standard.png', 'profile.desktop'] 'profile.desktop'
install_data(config_dist_standard, ],
install_dir: join_paths(dir_config, 'standard') install_dir: join_paths(dir_config, dir)
) )
foreach cd: config_standard_output foreach cd: src
out = join_paths(dir_config, 'standard', cd) o = join_paths(dir_config, dir, cd + '.cfg')
meson.add_install_script(chmod, 'a+r', out) meson.add_install_script(chmod, 'a+r', o)
endforeach endforeach

70
config/tiling/meson.build
View File

@ -1,44 +1,36 @@
config_tiling = ['e.src', 'e_bindings.src', dir = 'tiling'
'module.battery.src', src = [
'module.cpufreq.src', 'e',
'module.fileman.src', 'e_bindings',
'module.ibar.src', 'module.battery',
'module.ibox.src', 'module.cpufreq',
'module.pager.src', 'module.fileman',
'module.temperature.src', 'module.ibar',
'module.tiling.src', 'module.ibox',
'module.conf.src' 'module.pager',
] 'module.temperature',
'module.tiling',
config_tiling_output = ['e.cfg', 'e_bindings.cfg', 'module.conf'
'module.battery.cfg',
'module.cpufreq.cfg',
'module.fileman.cfg',
'module.ibar.cfg',
'module.ibox.cfg',
'module.pager.cfg',
'module.temperature.cfg',
'module.tiling.cfg',
'module.conf.cfg'
] ]
##### boilerplate config build + install of icons/dirs
i = 0 i = 0
foreach cd: config_tiling foreach cd: src
custom_target(' '.join(['config_dist_tiling', cd]), custom_target(' '.join(['config_dist', dir, cd]),
input: cd, input : cd + '.src',
command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], output : cd + '.cfg',
output: config_tiling_output[i], command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
install: true, install : true,
install_dir: join_paths(dir_config, 'tiling') install_dir: join_paths(dir_config, dir)
) )
i += 1 i += 1
endforeach endforeach
install_data([ 'enlightenment-' + dir + '.png',
config_dist_tiling = ['enlightenment-tiling.png', 'profile.desktop'] 'profile.desktop'
install_data(config_dist_tiling, ],
install_dir: join_paths(dir_config, 'tiling') install_dir: join_paths(dir_config, dir)
) )
foreach cd: config_tiling_output foreach cd: src
out = join_paths(dir_config, 'tiling', cd) o = join_paths(dir_config, dir, cd + '.cfg')
meson.add_install_script(chmod, 'a+r', out) meson.add_install_script(chmod, 'a+r', o)
endforeach endforeach

20
meson.build
View File

@ -82,7 +82,7 @@ config_h.set('_ALL_SOURCE' , '1')
config_h.set('_POSIX_PTHREAD_SEMANTICS', '1') config_h.set('_POSIX_PTHREAD_SEMANTICS', '1')
config_h.set('_TANDEM_SOURCE' , '1') config_h.set('_TANDEM_SOURCE' , '1')
config_h.set('__EXTENSIONS__' , '1') config_h.set('__EXTENSIONS__' , '1')
#config_h.set('E_RELEASE_BUILD', '1') #config_h.set('E_RELEASE_BUILD' , '1')
if get_option('nls') == true if get_option('nls') == true
subdir('po') subdir('po')
@ -302,13 +302,13 @@ if get_option('wayland') == true
]) ])
wayland_scanner = find_program('wayland-scanner') wayland_scanner = find_program('wayland-scanner')
gen_scanner_client = generator(wayland_scanner, gen_scanner_client = generator(wayland_scanner,
output: '@BASENAME@-client-protocol.h', output : '@BASENAME@-client-protocol.h',
arguments: ['client-header', '@INPUT@', '@OUTPUT@']) arguments: ['client-header', '@INPUT@', '@OUTPUT@'])
gen_scanner_server = generator(wayland_scanner, gen_scanner_server = generator(wayland_scanner,
output: '@BASENAME@-server-protocol.h', output : '@BASENAME@-server-protocol.h',
arguments: ['server-header', '@INPUT@', '@OUTPUT@']) arguments: ['server-header', '@INPUT@', '@OUTPUT@'])
gen_scanner_impl = generator(wayland_scanner, gen_scanner_impl = generator(wayland_scanner,
output: '@BASENAME@-protocol.c', output : '@BASENAME@-protocol.c',
arguments: ['code', '@INPUT@', '@OUTPUT@']) arguments: ['code', '@INPUT@', '@OUTPUT@'])
config_h.set('HAVE_WAYLAND', '1') config_h.set('HAVE_WAYLAND', '1')
endif endif
@ -325,11 +325,6 @@ if dep_xkeyboard_config.found() == true
config_h.set_quoted('XKB_BASE', dep_xkeyboard_config.get_pkgconfig_variable('xkb_base')) config_h.set_quoted('XKB_BASE', dep_xkeyboard_config.get_pkgconfig_variable('xkb_base'))
endif endif
eet = find_program('eet')
gen_eet = generator(eet,
output: '@BASENAME@.cfg',
arguments: ['-e', '@OUTPUT@', 'config', '@INPUT@', '1'])
eldbus_codegen = find_program('eldbus-codegen') eldbus_codegen = find_program('eldbus-codegen')
requires_e = [] requires_e = []
@ -341,12 +336,6 @@ endif
subdir('src/bin') subdir('src/bin')
module_files = []
module_ldflags = '-module -avoid-version'
module_includes = [ '../../..', '../../bin', '../../bin/efx' ]
module_includes2 = [ '../..' , '../bin' , '../bin/efx' ]
module_deps = [ deps_e, dep_dl ]
subdir('src/modules') subdir('src/modules')
subdir('config') subdir('config')
@ -376,7 +365,6 @@ pkgconfig.generate(name : proj,
description : 'Enlightenment Window Manager', description : 'Enlightenment Window Manager',
filebase : proj, filebase : proj,
subdirs : proj, subdirs : proj,
#requires: deps_e,
requires : requires_e, requires : requires_e,
version : e_version_rev, version : e_version_rev,
libraries_private: '-lm', libraries_private: '-lm',

6
src/modules/meson.build
View File

@ -1,3 +1,9 @@
module_files = []
module_ldflags = '-module -avoid-version'
module_includes = [ '../../..', '../../bin', '../../bin/efx' ]
module_includes2 = [ '../..' , '../bin' , '../bin/efx' ]
module_deps = [ deps_e, dep_dl ]
subdir('battery') subdir('battery')
subdir('cpufreq') subdir('cpufreq')
subdir('wizard') subdir('wizard')