module build - clean up and fix meson install of pretty much all modules

so we';re missing installing desktop files. edj icon files, wizard
data files in the wrong place, and much more. this also cleans up the
module meson build of pretty much all modules and make their build
files cimple and consistent so it's far easier to re-use things from
one module to the next. we should aim for simplicity, consistency
between as much as possible so we can refactor and turn into maybe
functions later. imho that starts with consistency though. until i can
see all the common patterns clearly, i don't want to write functions
yet. it's easier to see if all the files are consistently using the
same vars and formatting etc. etc. etc.

but either way the installation needs fixing so it installs all files
in the right places with the right permissions etc. etc. etc.

this doesn't fix all module build files bt all the ones i found that
were broken installs and they use what i think is a cleaner/simpler
template, BUT there is far too much copy & pastage here... far too
much.i need to find a cleaner way to automate this.
This commit is contained in:
Carsten Haitzler 2017-07-25 18:57:15 +09:00
parent 721b1b9449
commit 84bf48b3ed
28 changed files with 772 additions and 561 deletions

View File

@ -1,7 +1,5 @@
EXTRA_DIST += src/modules/policy_mobile/e-module-policy-mobile.edj
if USE_MODULE_POLICY_MOBILE
policy_mobiledir = $(MDIR)/policy_mobile
policy_mobile_DATA = src/modules/policy_mobile/e-module-policy-mobile.edj
policy_mobilepkgdir = $(MDIR)/policy_mobile/$(MODULE_ARCH)
policy_mobilepkg_LTLIBRARIES = src/modules/policy_mobile/module.la

View File

@ -3,10 +3,7 @@ wdd = src/modules/wizard/data/desktop/home.desktop \
src/modules/wizard/data/desktop/root.desktop \
src/modules/wizard/data/desktop/tmp.desktop
EXTRA_DIST += src/modules/wizard/module.desktop \
src/modules/wizard/e-module-wizard.edj \
$(wd) \
$(wdd)
EXTRA_DIST += $(wd) $(wdd)
if USE_MODULE_WIZARD
wizarddir = $(MDIR)/wizard
wizard_DATA = $(wd)

View File

@ -1,23 +1,35 @@
luncher_src = [
'bar.c',
'config.c',
'grid.c',
'mod.c',
'luncher.h',
module = 'luncher'
opt = 'luncher'
conf = 'USE_MODULE_LUNCHER'
src = [
'mod.c',
'bar.c',
'config.c',
'grid.c',
'luncher.h'
]
luncher_dir = join_paths(dir_module_e, 'luncher', module_arch)
if get_option('luncher') == true
config_h.set('USE_MODULE_LUNCHER', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(luncher_dir, 'luncher.so')
shared_module('luncher',
luncher_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: luncher_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,26 +1,37 @@
msgbus_src = [
'e_mod_main.c',
'msgbus_audit.c',
'msgbus_desktop.c',
'msgbus_lang.c',
'msgbus_module.c',
'msgbus_profile.c',
'msgbus_window.c',
'e_mod_main.h',
module = 'msgbus'
opt = 'msgbus'
conf = 'USE_MODULE_MSGBUS'
src = [
'e_mod_main.c',
'msgbus_audit.c',
'msgbus_desktop.c',
'msgbus_lang.c',
'msgbus_module.c',
'msgbus_profile.c',
'msgbus_window.c',
'e_mod_main.h'
]
msgbus_dir = join_paths(dir_module_e, 'msgbus', module_arch)
if get_option('msgbus') == true
config_h.set('USE_MODULE_MSGBUS', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(msgbus_dir, 'msgbus.so')
shared_module('msgbus',
msgbus_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: msgbus_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,34 +1,45 @@
music_control_src = [
'e_mod_main.c',
'ui.c',
'e_mod_main.h',
'private.h',
module = 'music_control'
opt = 'music-control'
conf = 'USE_MODULE_MUSIC_CONTROL'
src = [
'e_mod_main.c',
'ui.c',
'e_mod_main.h',
'private.h'
]
music_control_dir = join_paths(dir_module_e, 'music-control', module_arch)
if get_option('music-control') == true
config_h.set('USE_MODULE_MUSIC_CONTROL', '1')
icon = [
## XXX: bad pttern with module icon name
'e-module-' + opt + '.edj',
'module.desktop'
]
gen_music_control = custom_target('music_control_gen',
input: 'introspect.xml',
command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'],
output: [
'eldbus_media_player2_player.c',
'eldbus_mpris_media_player2.c',
'eldbus_media_player2_player.h',
'eldbus_mpris_media_player2.h',
'eldbus_utils.h',
],
)
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
module_files += join_paths(music_control_dir, 'music-control.so')
shared_module('music-control',
[music_control_src, gen_music_control],
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
gen_dbus = custom_target('gen-dbus',
input : 'introspect.xml',
command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'],
output : [
'eldbus_media_player2_player.c',
'eldbus_mpris_media_player2.c',
'eldbus_media_player2_player.h',
'eldbus_mpris_media_player2.h',
'eldbus_utils.h'
]
)
shared_module(module, [src, gen_dbus] ,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: music_control_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,22 +1,33 @@
notification_src = [
'e_mod_config.c',
'e_mod_main.c',
'e_mod_popup.c',
'e_mod_main.h',
module = 'notification'
opt = 'notification'
conf = 'USE_MODULE_NOTIFICATION'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_popup.c',
'e_mod_main.h'
]
notification_dir = join_paths(dir_module_e, 'notification', module_arch)
if get_option('notification') == true
config_h.set('USE_MODULE_NOTIFICATION', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(notification_dir, 'notification.so')
shared_module('notification',
notification_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: notification_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,24 +1,35 @@
packagekit_src = [
'e_mod_config.c',
'e_mod_main.c',
'e_mod_packagekit.c',
'e_mod_config.h',
'e_mod_main.h',
'e_mod_packagekit.h',
module = 'packagekit'
opt = 'packagekit'
conf = 'USE_MODULE_PACKAGEKIT'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_packagekit.c',
'e_mod_config.h',
'e_mod_main.h',
'e_mod_packagekit.h'
]
packagekit_dir = join_paths(dir_module_e, 'packagekit', module_arch)
if get_option('packagekit') == true
config_h.set('USE_MODULE_PACKAGEKIT', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(packagekit_dir, 'packagekit.so')
shared_module('packagekit',
packagekit_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: packagekit_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,25 +1,36 @@
pager_src = [
'e_mod_config.c',
'e_mod_main.c',
'e_mod_main.h',
'gadget/pager.h',
'gadget/pager.c',
'gadget/mod.c',
'gadget/config.c'
module = 'pager'
opt = 'pager'
conf = 'USE_MODULE_PAGER'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h',
'gadget/mod.c',
'gadget/pager.h',
'gadget/pager.c',
'gadget/config.c'
]
pager_dir = join_paths(dir_module_e, 'pager', module_arch)
if get_option('pager') == true
config_h.set('USE_MODULE_PAGER', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(pager_dir, 'pager.so')
shared_module('pager',
pager_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: pager_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,21 +1,33 @@
pager_plain_src = [
'e_mod_config.c',
'e_mod_main.c',
'e_mod_main.h',
module = 'pager_plain'
opt = 'pager-plain'
conf = 'USE_MODULE_PAGER_PLAIN'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
]
pager_plain_dir = join_paths(dir_module_e, 'pager_plain', module_arch)
if get_option('pager-plain') == true
config_h.set('USE_MODULE_PAGER_PLAIN', '1')
icon = [
## XXX: bad pttern with module icon name
'e-module-' + opt + '.edj',
'module.desktop'
]
module_files += join_paths(pager_plain_dir, 'pager_plain.so')
shared_module('pager_plain',
pager_plain_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: pager_plain_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,24 +1,35 @@
quickaccess_src = [
'e_mod_config.c',
'e_mod_main.c',
'e_mod_quickaccess.c',
'e_quickaccess_bindings.c',
'e_quickaccess_db.c',
'e_mod_main.h',
module = 'quickaccess'
opt = 'quickaccess'
conf = 'USE_MODULE_QUICKACCESS'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_quickaccess.c',
'e_quickaccess_bindings.c',
'e_quickaccess_db.c',
'e_mod_main.h',
]
quickaccess_dir = join_paths(dir_module_e, 'quickaccess', module_arch)
if get_option('quickaccess') == true
config_h.set('USE_MODULE_QUICKACCESS', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(quickaccess_dir, 'quickaccess.so')
shared_module('quickaccess',
quickaccess_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: quickaccess_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,19 +1,30 @@
shot_src = [
'e_mod_main.c',
module = 'shot'
opt = 'shot'
conf = 'USE_MODULE_SHOT'
src = [
'e_mod_main.c'
]
shot_dir = join_paths(dir_module_e, 'shot', module_arch)
if get_option('shot') == true
config_h.set('USE_MODULE_SHOT', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(shot_dir, 'shot.so')
shared_module('shot',
shot_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: shot_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,20 +1,31 @@
start_src = [
'e_mod_main.c',
'start.c',
module = 'start'
opt = 'start'
conf = 'USE_MODULE_START'
src = [
'e_mod_main.c',
'start.c'
]
start_dir = join_paths(dir_module_e, 'start', module_arch)
if get_option('start') == true
config_h.set('USE_MODULE_START', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(start_dir, 'start.so')
shared_module('start',
start_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: start_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,23 +1,34 @@
syscon_src = [
'e_int_config_syscon.c',
'e_mod_main.c',
'e_syscon.c',
'e_syscon_gadget.c',
'e_mod_main.h',
module = 'syscon'
opt = 'syscon'
conf = 'USE_MODULE_SYSCON'
src = [
'e_mod_main.c',
'e_int_config_syscon.c',
'e_syscon.c',
'e_syscon_gadget.c',
'e_mod_main.h'
]
syscon_dir = join_paths(dir_module_e, 'syscon', module_arch)
if get_option('syscon') == true
config_h.set('USE_MODULE_SYSCON', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(syscon_dir, 'syscon.so')
shared_module('syscon',
syscon_src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: syscon_dir,
install: true
)
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,72 +1,83 @@
sysinfo_src = [
'mod.c',
'sysinfo.c',
'sysinfo.h',
'batman/batman.h',
'batman/batman.c',
'batman/batman_fallback.c',
'batman/batman_config.c',
'thermal/thermal.h',
'thermal/thermal.c',
'thermal/thermal_config.c',
'thermal/thermal_fallback.c',
'cpuclock/cpuclock.h',
'cpuclock/cpuclock.c',
'cpuclock/cpuclock_config.c',
'cpumonitor/cpumonitor.h',
'cpumonitor/cpumonitor.c',
'cpumonitor/cpumonitor_config.c',
'cpumonitor/cpumonitor_proc.c',
'memusage/memusage.h',
'memusage/memusage.c',
'memusage/memusage_config.c',
'memusage/memusage_proc.c',
'netstatus/netstatus.h',
'netstatus/netstatus.c',
'netstatus/netstatus_config.c',
'netstatus/netstatus_proc.c',
module = 'sysinfo'
opt = 'sysinfo'
conf = 'USE_MODULE_SYSINFO'
src = [
'mod.c',
'sysinfo.c',
'sysinfo.h',
'batman/batman.h',
'batman/batman.c',
'batman/batman_fallback.c',
'batman/batman_config.c',
'thermal/thermal.h',
'thermal/thermal.c',
'thermal/thermal_config.c',
'thermal/thermal_fallback.c',
'cpuclock/cpuclock.h',
'cpuclock/cpuclock.c',
'cpuclock/cpuclock_config.c',
'cpumonitor/cpumonitor.h',
'cpumonitor/cpumonitor.c',
'cpumonitor/cpumonitor_config.c',
'cpumonitor/cpumonitor_proc.c',
'memusage/memusage.h',
'memusage/memusage.c',
'memusage/memusage_config.c',
'memusage/memusage_proc.c',
'netstatus/netstatus.h',
'netstatus/netstatus.c',
'netstatus/netstatus_config.c',
'netstatus/netstatus_proc.c'
]
if config_h.has('HAVE_EEZE') == true
sysinfo_src += ['batman/batman_udev.c', 'thermal/thermal_udev.c']
src += [
'batman/batman_udev.c',
'thermal/thermal_udev.c'
]
elif host_machine.system().contains('bsd') == true
sysinfo_src += ['batman/batman_sysctl.c',
'thermal/thermal_sysctl.c',
'cpuclock/cpuclock_sysctl.c',
'netstatus/netstatus_sysctl.c',
'cpumonitor/cpumonitor_sysctl.c',
'memusage/memusage_sysctl.c'
]
src += ['batman/batman_sysctl.c',
'thermal/thermal_sysctl.c',
'cpuclock/cpuclock_sysctl.c',
'netstatus/netstatus_sysctl.c',
'cpumonitor/cpumonitor_sysctl.c',
'memusage/memusage_sysctl.c'
]
else
sysinfo_src += ['batman/batman_upower.c',
'thermal/thermal_sysctl.c',
'cpuclock/cpuclock_sysctl.c'
]
src += ['batman/batman_upower.c',
'thermal/thermal_sysctl.c',
'cpuclock/cpuclock_sysctl.c'
]
endif
sysinfo_dir = join_paths(dir_module_e, 'sysinfo', module_arch)
if get_option('sysinfo') == true
config_h.set('USE_MODULE_SYSINFO', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(sysinfo_dir, 'sysinfo.so')
shared_module('sysinfo',
sysinfo_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: sysinfo_dir,
install: true
)
executable('cpuclock_sysfs',
'cpuclock/cpuclock_sysfs.c',
include_directories: include_directories(module_includes),
dependencies: dep_crypt,
c_args: suid_cflags,
link_args: suid_ldflags,
install_dir: join_paths(dir_module_e, 'sysinfo'),
install: true
)
suid_exes == join_paths(sysinfo_dir, 'cpuclock_sysfs')
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
executable('cpuclock_sysfs',
'cpuclock/cpuclock_sysfs.c',
dependencies: dep_crypt,
c_args : suid_cflags,
link_args : suid_ldflags,
install_dir : dir_mod_bin,
install : true
)
suid_exes += join_paths(dir_mod_bin, 'cpuclock_sysfs')
endif

View File

@ -1,24 +1,35 @@
systray_src = [
'e_mod_main.c',
'e_mod_notifier_host.c',
'e_mod_notifier_host_dbus.c',
'e_mod_notifier_watcher.c',
'e_mod_main.h',
'e_mod_notifier_host_private.h',
module = 'systray'
opt = 'systray'
conf = 'USE_MODULE_SYSTRAY'
src = [
'e_mod_main.c',
'e_mod_notifier_host.c',
'e_mod_notifier_host_dbus.c',
'e_mod_notifier_watcher.c',
'e_mod_main.h',
'e_mod_notifier_host_private.h'
]
systray_dir = join_paths(dir_module_e, 'systray', module_arch)
if get_option('systray') == true
config_h.set('USE_MODULE_SYSTRAY', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(systray_dir, 'systray.so')
shared_module('systray',
systray_src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: systray_dir,
install: true
)
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,21 +1,32 @@
tasks_src = [
'e_mod_config.c',
'e_mod_main.c',
'e_mod_main.h',
module = 'tasks'
opt = 'tasks'
conf = 'USE_MODULE_TASKS'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
]
tasks_dir = join_paths(dir_module_e, 'tasks', module_arch)
if get_option('tasks') == true
config_h.set('USE_MODULE_TASKS', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(tasks_dir, 'tasks.so')
shared_module('tasks',
tasks_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: tasks_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,35 +1,47 @@
teamwork_src = [
'e_mod_config.c',
'e_mod_main.c',
'e_mod_tw.c',
'e_mod_main.h',
module = 'teamwork'
opt = 'teamwork'
conf = 'USE_MODULE_TEAMWORK'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_tw.c',
'e_mod_main.h'
]
if config_h.has('HAVE_WAYLAND') == true
teamwork_src += [
'wl.c',
'wl_teamwork.c',
'wl_teamwork.h'
]
src += [
'wl.c',
'wl_teamwork.c',
'wl_teamwork.h'
]
endif
if config_h.has('HAVE_WAYLAND_ONLY') == false
teamwork_src += [
'x11.c'
]
src += [
'x11.c'
]
endif
teamwork_dir = join_paths(dir_module_e, 'teamwork', module_arch)
if get_option('teamwork') == true
config_h.set('USE_MODULE_TEAMWORK', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(teamwork_dir, 'teamwork.so')
shared_module('teamwork',
teamwork_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: teamwork_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,23 +1,35 @@
temperature_src = [
'e_mod_config.c',
'e_mod_main.c',
'e_mod_tempget.c',
'e_mod_udev.c',
'e_mod_main.h',
module = 'temperature'
opt = 'temperature'
conf = 'USE_MODULE_TEMPERATURE'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_tempget.c',
'e_mod_udev.c',
'e_mod_main.h'
]
temperature_dir = join_paths(dir_module_e, 'temperature', module_arch)
if get_option('temperature') == true
config_h.set('USE_MODULE_TEMPERATURE', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(temperature_dir, 'temperature.so')
shared_module('temperature',
temperature_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: temperature_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,25 +1,34 @@
tiling_src = [
'e_mod_config.c',
'e_mod_tiling.c',
'window_tree.c',
'e_mod_tiling.h',
'window_tree.h',
module = 'tiling'
opt = 'tiling'
conf = 'USE_MODULE_TILING'
src = [
'e_mod_tiling.c',
'e_mod_config.c',
'window_tree.c',
'e_mod_tiling.h',
'window_tree.h'
]
tiling_mod_dir = join_paths(dir_module_e, 'tiling')
tiling_dir = join_paths(tiling_mod_dir, module_arch)
if get_option('tiling') == true
config_h.set('USE_MODULE_TILING', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(tiling_dir, 'tiling.so')
shared_module('tiling',
tiling_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: tiling_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif
install_data('e-module-tiling.edj', install_dir: tiling_mod_dir, install : true)

View File

@ -1,23 +1,35 @@
time_src = [
'clock.c',
'config.c',
'mod.c',
'time.c',
'clock.h',
module = 'time'
opt = 'time'
conf = 'USE_MODULE_TIME'
src = [
'mod.c',
'clock.c',
'config.c',
'time.c',
'clock.h'
]
time_dir = join_paths(dir_module_e, 'time', module_arch)
if get_option('time') == true
config_h.set('USE_MODULE_TIME', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(time_dir, 'time.so')
shared_module('time',
time_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: time_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,23 +1,35 @@
winlist_src = [
'e_int_config_winlist.c',
'e_mod_main.c',
'e_winlist.c',
'e_mod_main.h',
'e_winlist.h',
module = 'winlist'
opt = 'winlist'
conf = 'USE_MODULE_WINLIST'
src = [
'e_mod_main.c',
'e_int_config_winlist.c',
'e_winlist.c',
'e_mod_main.h',
'e_winlist.h'
]
winlist_dir = join_paths(dir_module_e, 'winlist', module_arch)
if get_option('winlist') == true
config_h.set('USE_MODULE_WINLIST', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(winlist_dir, 'winlist.so')
shared_module('winlist',
winlist_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: winlist_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,22 +1,34 @@
wireless_src = [
'connman.c',
'mod.c',
'wireless.c',
'wireless.h',
module = 'wireless'
opt = 'wireless'
conf = 'USE_MODULE_WIRELESS'
src = [
'mod.c',
'connman.c',
'wireless.c',
'wireless.h'
]
wireless_dir = join_paths(dir_module_e, 'wireless', module_arch)
if get_option('wireless') == true
config_h.set('USE_MODULE_WIRELESS', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(wireless_dir, 'wireless.so')
shared_module('wireless',
wireless_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: wireless_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,67 +1,72 @@
wizard_dist = [
'data/def-ibar.txt',
'data/desktop/home.desktop',
'data/desktop/root.desktop',
'data/desktop/tmp.desktop'
module = 'wizard'
opt = 'wizard'
conf = 'USE_MODULE_WIZARD'
src = [
'e_mod_main.c',
'e_wizard.c',
'e_wizard.h'
]
wizard_src = [
'e_mod_main.c',
'e_wizard.c',
'e_wizard.h',
pages = [
'page_000',
'page_010',
'page_011',
'page_020',
'page_030',
'page_040',
'page_050',
'page_060',
'page_065',
'page_070',
'page_080',
'page_090',
'page_100',
'page_110',
'page_120',
'page_130',
'page_150',
'page_160',
'page_170',
'page_180',
'page_200'
]
wizard_mods = [
'page_000',
'page_010',
'page_011',
'page_020',
'page_030',
'page_040',
'page_050',
'page_060',
'page_065',
'page_070',
'page_080',
'page_090',
'page_100',
'page_110',
'page_120',
'page_130',
'page_150',
'page_160',
'page_170',
'page_180',
'page_200',
ibar_def = [
'data/def-ibar.txt'
]
wizard_dir = join_paths(dir_module_e, 'wizard', module_arch)
if get_option('wizard') == true
config_h.set('USE_MODULE_WIZARD', '1')
desktops = [
'data/desktop/home.desktop',
'data/desktop/root.desktop',
'data/desktop/tmp.desktop'
]
install_data(wizard_dist,
install_dir: join_paths(dir_module_e, 'wizard')
)
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
module_files += join_paths(wizard_dir, 'wizard.so')
shared_module('wizard',
wizard_src,
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(ibar_def, install_dir: dir_mod)
install_data(desktops, install_dir: join_paths(dir_mod, 'desktop'))
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: wizard_dir,
install: true
)
foreach wizard_mod: wizard_mods
shared_module(wizard_mod,
'@0@.c'.format(wizard_mod),
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: wizard_dir,
install: true
)
endforeach
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
foreach page: pages
shared_module(page, '@0@.c'.format(page),
include_directories: include_directories(module_includes),
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endforeach
endif

View File

@ -1,37 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Type=Link
Name=First Run Wizard
Name[ca]=Assistent inicial
Name[cs]=Průvodce prvním spuštěním
Name[de]=Ersteschritteassistent
Name[eo]=Asistanto de unua lanĉo
Name[es]=Asistente del primer inicio
Name[fi]=Alkuasetusvelho
Name[fr]=Assistant de prise en main
Name[gl]=Asistente do primeiro inicio
Name[hu]=Első indítás varázsló
Name[it]=Wizard prima esecuzione
Name[lt]=Pirmojo paleidimo vedlys
Name[ms]=Bestari Jalan Kali Pertama
Name[pt]=Assistente
Name[ru]=Мастер первого запуска
Name[sr]=Чаробњак првог покретања
Name[tr]=İlk Açılış Sihirbazı
Comment=<title>First Run Wizard</title><br>The first run wizard will help configure E, when E is started for the first time.<br><urgent>WARNING!!! DO NOT USE!!!</urgent>
Comment[ca]=<title>Assistent inicial</title><br>Aquest assistent ajuda a configurar l'Enlightenment quan s'inicia per primera vegada.<br><urgent>ATENCIÓ!!! NO L'UTILITZEU!!!</urgent>
Comment[cs]=<title>Průvodce prvním spuštěním</title><br>Průvodce, který pomůže nastavit Enlightenment při prvním spuštění.<br><urgent>VAROVÁNÍ!!! NEPOUŽÍVEJTE!!! Aktivován pouze při prvním spuštění!</urgent>
Comment[de]=<title>Ersteschritteassistent</title><br>Dieser Assistent hilft beim erstmaligen Einrichten von Enlightenment.<br><urgent>ACHTUNG!!! NICHT BENUTZEN!!!</urgent>
Comment[eo]=<title>Asistanto de unua lanĉo</title><br>La asistanto de unua lanĉo helpos vi agordi Enlightenment, kiam Enlightenment startiĝos je la unua fojo.<br><urgent>ATENTU!!! NE UZI!!!</urgent>
Comment[es]=<title>Asistente del primer inicio</title><br>Este asistente le ayuda a configurar E cuando este se inicia por primera vez.<br><urgent>¡¡¡ATENCIÓN!!! ¡¡¡NO USAR!!!</urgent>
Comment[fr]=<title>Assistant de prise en main</title><br>Cet assistant vous aidera à configurer Enlightenment au premier lancement.<br><urgent>ATTENTION !! NE PAS UTILISER !!</urgent>
Comment[gl]=<title>Asistente do primeiro inicio</title><br>Este asistente axúdalle a configurar E cando este se inicia por primeira vez.<br><urgent>ATENCIÓN!!! NON USAR!!!</urgent>
Comment[hu]=<title>Első indítás varázsló</title><br>Ez a varázsló segítséget nyújt a számodra az Enlightenment beállításához.<br><urgent>FIGYELEM!!! NE HASZNÁLD!!!</urgent>
Comment[it]=<title>Wizard prima esecuzione</title><br>Wizard che aiuta a configurare Enlightenment la prima volta che questo viene avviato.<br><urgent>ATTENZIONE!!! NON USARE!!!</urgent>
Comment[ms]=<title>Bestari Mula-mula Dijalankan</title><br>Akan bantu mengkonfigur E, bila E dimulakan buat kali pertama.<br><urgent>AMARAN!!! JANGAN GUNA!!!</urgent>
Comment[pt]=<title>Assistente</title><br>Este assistente ajuda-o a configurar o E na primeira vez que é iniciado.<br><urgent>AVISO!!! NÃO DEVE SER UTILIZADO!!!</urgent>
Comment[ru]=<title>Мастер первого запуска</title><br>Этот модуль поможет сконфигурировать Enlightenment при запуске в первый раз.<br><urgent>ВНИМАНИЕ!!! НЕ ИСПОЛЬЗОВАТЬ!!!</urgent>
Comment[sr]=<title>Чаробњак првог покретања</title><br>Чаробњак првог покретања помаже да се подеси Е при првом покретању.<br><urgent>УПОЗОРЕЊЕ!!! НЕ КОРИСТИТИ!!!</urgent>
Comment[tr]=<title>İlk Açılış Sihirbazı</title><br>Enlightenment ilk açıldığında onu yapılandırmakta kullanılan bir ilk açılış sihirbazı.<br><urgent>UYARI!!! KULLANMAYIN!!!</urgent>
Icon=e-module-wizard
X-Enlightenment-ModuleType=config

View File

@ -1,35 +1,46 @@
wl_desktop_shell_src = [
'e_mod_input_panel.c',
'e_mod_main.c',
'wl_shell.c',
'xdg5.c',
'xdg6.c',
'e_mod_main.h',
module = 'wl_desktop_shell'
opt = 'wl-desktop-shell'
conf = 'USE_MODULE_WL_DESKTOP_SHELL'
src = [
'e_mod_main.c',
'e_mod_input_panel.c',
'wl_shell.c',
'xdg5.c',
'xdg6.c',
'e_mod_main.h'
]
wl_desktop_shell_dir = join_paths(dir_module_e, 'wl_desktop_shell', module_arch)
if get_option('wl-desktop-shell') == true and get_option('wayland') == true
config_h.set('USE_MODULE_WL_DESKTOP_SHELL', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
protos = [
'@0@/unstable/xdg-shell/xdg-shell-unstable-v5.xml'.format(dir_wayland_protocols),
'@0@/unstable/xdg-shell/xdg-shell-unstable-v6.xml'.format(dir_wayland_protocols),
'@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
]
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
foreach proto: protos
wl_desktop_shell_src += gen_scanner_server.process(proto)
wl_desktop_shell_src += gen_scanner_impl.process(proto)
endforeach
if get_option(opt) == true and get_option('wayland') == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
module_files += join_paths(wl_desktop_shell_dir, 'wl_desktop_shell.so')
shared_module('wl_desktop_shell',
wl_desktop_shell_src,
install_data(icon, install_dir: dir_mod)
protos = [
'@0@/unstable/xdg-shell/xdg-shell-unstable-v5.xml'.format(dir_wayland_protocols),
'@0@/unstable/xdg-shell/xdg-shell-unstable-v6.xml'.format(dir_wayland_protocols),
'@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
]
foreach proto: protos
src += gen_scanner_server.process(proto)
src += gen_scanner_impl.process(proto)
endforeach
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: wl_desktop_shell_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif

View File

@ -1,26 +1,38 @@
xkbswitch_src = [
'e_mod_config.c',
'e_mod_main.c',
'e_mod_parse.c',
'e_mod_main.h',
'e_mod_parse.h',
'gadget/xkbswitch.h',
'gadget/xkbswitch.c',
'gadget/mod.c'
module = 'xkbswitch'
opt = 'xkbswitch'
conf = 'USE_MODULE_XKBSWITCH'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_parse.c',
'e_mod_main.h',
'e_mod_parse.h',
'gadget/xkbswitch.h',
'gadget/xkbswitch.c',
'gadget/mod.c'
]
xkbswitch_dir = join_paths(dir_module_e, 'xkbswitch', module_arch)
if get_option('xkbswitch') == true
config_h.set('USE_MODULE_XKBSWITCH', '1')
icon = [
'e-module-' + module + '.edj',
'module.desktop'
]
module_files += join_paths(xkbswitch_dir, 'xkbswitch.so')
shared_module('xkbswitch',
xkbswitch_src,
dir_mod = join_paths(dir_module_e, module)
dir_mod_bin = join_paths(dir_mod, module_arch)
if get_option(opt) == true
config_h.set(conf, '1')
module_files += join_paths(dir_mod_bin, module + '.so')
install_data(icon, install_dir: dir_mod)
shared_module(module, src,
include_directories: include_directories(module_includes),
name_prefix: '',
dependencies: module_deps,
install_dir: xkbswitch_dir,
install: true
)
name_prefix : '',
dependencies : module_deps,
install_dir : dir_mod_bin,
install : true
)
endif