meson - fix config install to install cfg files in right places and perms

cfg files were installed on top of eachother in the wrong directories
and they were unreadable by anyone but root (if you sudo make
install)... so fix this with my new chmod fixing stuff (yes meson
doesnt let you specific permissions for custom targets).
devs/bu5hm4n/meson_wip
Carsten Haitzler 5 years ago
parent 1cfdcc0482
commit 3126f103f0
  1. 6
      config/default/meson.build
  2. 2
      config/meson.build
  3. 6
      config/mobile/meson.build
  4. 6
      config/standard/meson.build
  5. 6
      config/tiling/meson.build
  6. 2
      meson-chmod.sh
  7. 2
      meson.build

@ -9,7 +9,11 @@ foreach cd: config_default
command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
output: config_default_output[i],
install: true,
install_dir: dir_config
install_dir: join_paths(dir_config, 'default')
)
i += 1
endforeach
foreach cd: config_default_output
out = join_paths(dir_config, 'default', cd)
meson.add_install_script(chmod, 'a+r', out)
endforeach

@ -7,6 +7,8 @@ custom_target('profile.src',
install: true,
install_dir: dir_config
)
out = join_paths(dir_config, 'profile.cfg')
meson.add_install_script(chmod, 'a+r', out)
subdir('default')
subdir('mobile')

@ -8,7 +8,7 @@ foreach cd: config_mobile
command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
output: config_mobile_output[i],
install: true,
install_dir: dir_config
install_dir: join_paths(dir_config, 'mobile')
)
i += 1
endforeach
@ -17,3 +17,7 @@ config_dist_mobile = ['enlightenment-mobile.png', 'profile.desktop']
install_data(config_dist_mobile,
install_dir: join_paths(dir_config, 'mobile')
)
foreach cd: config_mobile_output
out = join_paths(dir_config, 'mobile', cd)
meson.add_install_script(chmod, 'a+r', out)
endforeach

@ -27,7 +27,7 @@ foreach cd: config_standard
command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
output: config_standard_output[i],
install: true,
install_dir: dir_config
install_dir: join_paths(dir_config, 'standard')
)
i += 1
endforeach
@ -36,3 +36,7 @@ config_dist_standard = ['enlightenment-standard.png', 'profile.desktop']
install_data(config_dist_standard,
install_dir: join_paths(dir_config, 'standard')
)
foreach cd: config_standard_output
out = join_paths(dir_config, 'standard', cd)
meson.add_install_script(chmod, 'a+r', out)
endforeach

@ -29,7 +29,7 @@ foreach cd: config_tiling
command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
output: config_tiling_output[i],
install: true,
install_dir: dir_config
install_dir: join_paths(dir_config, 'tiling')
)
i += 1
endforeach
@ -38,3 +38,7 @@ config_dist_tiling = ['enlightenment-tiling.png', 'profile.desktop']
install_data(config_dist_tiling,
install_dir: join_paths(dir_config, 'tiling')
)
foreach cd: config_tiling_output
out = join_paths(dir_config, 'tiling', cd)
meson.add_install_script(chmod, 'a+r', out)
endforeach

@ -0,0 +1,2 @@
#!/bin/sh
chmod "$1" "${DESTDIR}/$2"

@ -4,6 +4,8 @@ project('enlightenment', 'c',
default_options: [ 'c_std=gnu99', 'warning_level=2' ],
meson_version: '>= 0.40.0')
chmod = join_paths(meson.source_root(), 'meson-chmod.sh')
clean_check = run_command('meson/clean_check.sh')
if clean_check.returncode() == 0
error('Meson build requires a clean source tree')

Loading…
Cancel
Save