enlightenment
/
enlightenment
7
8
Fork 12
Code Issues 21 Pull Requests 3 Projects Releases Wiki Activity

meson - use install_mode

Browse Source
devs/devilhorns/rotation
Carsten Haitzler 5 years ago
parent c16034bcc8
commit 9568b29e64
9 changed files with 49 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      data/config/default/meson.build
  2. 13
      data/config/meson.build
  3. 18
      data/config/mobile/meson.build
  4. 18
      data/config/standard/meson.build
  5. 18
      data/config/tiling/meson.build
  6. 5
      data/tools/meson.build
  7. 1
      meson.build
  8. 2
      meson/meson-chmod.sh
  9. 19
      src/modules/vkbd/meson.build

15
data/config/default/meson.build
Unescape View File

@ -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

13
data/config/meson.build
Unescape View File

@ -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')

18
data/config/mobile/meson.build
Unescape View File

@ -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

18
data/config/standard/meson.build
Unescape View File

@ -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

18
data/config/tiling/meson.build
Unescape View File

@ -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

5
data/tools/meson.build
Unescape View File

@ -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)

1
meson.build
Unescape View File

@ -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')

2
meson/meson-chmod.sh
Unescape View File

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

19
src/modules/vkbd/meson.build
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save