diff --git a/data/config/default/meson.build b/data/config/default/meson.build index f993a4393..e19340537 100644 --- a/data/config/default/meson.build +++ b/data/config/default/meson.build @@ -8,15 +8,12 @@ src = [ i = 0 foreach cd: src custom_target(' '.join(['config_dist', dir, cd]), - input : cd + '.src', - output : cd + '.cfg', - command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], - install : true, - install_dir: join_paths(dir_config, dir) + input : cd + '.src', + output : cd + '.cfg', + command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], + install : true, + install_dir : join_paths(dir_config, dir), + install_mode : 'rw-r--r--' ) i += 1 endforeach -foreach cd: src - o = join_paths(dir_config, dir, cd + '.cfg') - meson.add_install_script(chmod, 'a+r', o) -endforeach diff --git a/data/config/meson.build b/data/config/meson.build index 3cc83881a..aa021e45e 100644 --- a/data/config/meson.build +++ b/data/config/meson.build @@ -7,14 +7,13 @@ if eet_cmd == '' endif custom_target('profile.src', - input : 'profile.src', - command : [eet_cmd, '-i', '@OUTPUT@', 'config', '@INPUT@', '1'], - output : ['profile.cfg'], - install : true, - install_dir: dir_config + input : 'profile.src', + command : [eet_cmd, '-i', '@OUTPUT@', 'config', '@INPUT@', '1'], + output : ['profile.cfg'], + install : true, + install_dir : dir_config, + install_mode : 'rw-r--r--' ) -out = join_paths(dir_config, 'profile.cfg') -meson.add_install_script(chmod, 'a+r', out) subdir('default') subdir('mobile') diff --git a/data/config/mobile/meson.build b/data/config/mobile/meson.build index 64be2ad4e..af0d3502b 100644 --- a/data/config/mobile/meson.build +++ b/data/config/mobile/meson.build @@ -10,20 +10,18 @@ src = [ i = 0 foreach cd: src custom_target(' '.join(['config_dist', dir, cd]), - input : cd + '.src', - output : cd + '.cfg', - command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], - install : true, - install_dir: join_paths(dir_config, dir) + input : cd + '.src', + output : cd + '.cfg', + command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], + install : true, + install_dir : join_paths(dir_config, dir), + install_mode : 'rw-r--r--' ) i += 1 endforeach install_data([ 'enlightenment-' + dir + '.png', 'profile.desktop' ], - install_dir: join_paths(dir_config, dir) + install_dir : join_paths(dir_config, dir), + install_mode : 'rw-r--r--' ) -foreach cd: src - o = join_paths(dir_config, dir, cd + '.cfg') - meson.add_install_script(chmod, 'a+r', o) -endforeach diff --git a/data/config/standard/meson.build b/data/config/standard/meson.build index dfaacd8cd..ad349d30c 100644 --- a/data/config/standard/meson.build +++ b/data/config/standard/meson.build @@ -16,20 +16,18 @@ src = [ i = 0 foreach cd: src custom_target(' '.join(['config_dist', dir, cd]), - input : cd + '.src', - output : cd + '.cfg', - command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], - install : true, - install_dir: join_paths(dir_config, dir) + input : cd + '.src', + output : cd + '.cfg', + command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], + install : true, + install_dir : join_paths(dir_config, dir), + install_mode : 'rw-r--r--' ) i += 1 endforeach install_data([ 'enlightenment-' + dir + '.png', 'profile.desktop' ], - install_dir: join_paths(dir_config, dir) + install_dir : join_paths(dir_config, dir), + install_mode : 'rw-r--r--' ) -foreach cd: src - o = join_paths(dir_config, dir, cd + '.cfg') - meson.add_install_script(chmod, 'a+r', o) -endforeach diff --git a/data/config/tiling/meson.build b/data/config/tiling/meson.build index 50f074ccb..b6d2c4c43 100644 --- a/data/config/tiling/meson.build +++ b/data/config/tiling/meson.build @@ -17,20 +17,18 @@ src = [ i = 0 foreach cd: src custom_target(' '.join(['config_dist', dir, cd]), - input : cd + '.src', - output : cd + '.cfg', - command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], - install : true, - install_dir: join_paths(dir_config, dir) + input : cd + '.src', + output : cd + '.cfg', + command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'], + install : true, + install_dir : join_paths(dir_config, dir), + install_mode : 'rw-r--r--' ) i += 1 endforeach install_data([ 'enlightenment-' + dir + '.png', 'profile.desktop' ], - install_dir: join_paths(dir_config, dir) + install_dir : join_paths(dir_config, dir), + install_mode : 'rw-r--r--' ) -foreach cd: src - o = join_paths(dir_config, dir, cd + '.cfg') - meson.add_install_script(chmod, 'a+r', o) -endforeach diff --git a/data/tools/meson.build b/data/tools/meson.build index d40a744f2..e95fd365d 100644 --- a/data/tools/meson.build +++ b/data/tools/meson.build @@ -1,5 +1,4 @@ install_data('enlightenment_remote', - install_dir: dir_bin + install_dir : dir_bin, + install_mode : 'rwxr-xr-x' ) -o = join_paths(dir_bin, 'enlightenment_remote') -meson.add_install_script(chmod, 'a+r+x', o) diff --git a/meson.build b/meson.build index b22266979..f8301380c 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,6 @@ project('enlightenment', 'c', ##### convenience variables for later proj = meson.project_name() ver = meson.project_version() -chmod = join_paths(meson.source_root(), 'meson/meson-chmod.sh') #### check for mixed autofoo and meson build tree mess clean_check = run_command('meson/clean_check.sh') diff --git a/meson/meson-chmod.sh b/meson/meson-chmod.sh deleted file mode 100755 index e72cb72c5..000000000 --- a/meson/meson-chmod.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -chmod "$1" "${DESTDIR}/$2" && touch "${DESTDIR}/$2" diff --git a/src/modules/vkbd/meson.build b/src/modules/vkbd/meson.build index fff164d87..f884efc0d 100644 --- a/src/modules/vkbd/meson.build +++ b/src/modules/vkbd/meson.build @@ -32,18 +32,20 @@ if get_option(m) == true ] edc = 'theme' custom_target(edc + '.edj', - input : edc + '.edc', - output : edc + '.edj', - command : cmd, - install_dir: _dir, - install : true + input : edc + '.edc', + output : edc + '.edj', + command : cmd, + install_dir : _dir, + install_mode : 'rw-r--r--', + install : true ) out = join_paths(_dir, edc + '.edj') - meson.add_install_script(chmod, 'a+r', out) install_data(['dicts/English_US_Small.dic', 'dicts/English_US.dic'], - install_dir: join_paths(_dir, 'dicts')) + install_dir : join_paths(_dir, 'dicts'), + install_mode : 'rw-r--r--' + ) install_data(['keyboards/Default.kbd', 'keyboards/Numbers.kbd', 'keyboards/Terminal.kbd', @@ -59,5 +61,6 @@ if get_option(m) == true 'keyboards/spanner.png', 'keyboards/tab.png', 'keyboards/up.png'], - install_dir: join_paths(_dir, 'keyboards')) + install_dir : join_paths(_dir, 'keyboards'), + install_mode : 'rw-r--r--') endif