Skip to content

Commit

Permalink
meson: Do not install symlinks on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
oleavr committed Apr 3, 2024
1 parent dfe7e9f commit 45e8993
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 42 deletions.
32 changes: 17 additions & 15 deletions compiler/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,20 @@ valac_exe = executable(

vala_name = 'vala@0@'.format(vala_version_suffix)

install_symlink(
f'vala@vala_version_suffix@@exe_ext@',
pointing_to: f'@valac_name@@exe_ext@',
install_dir: get_option('bindir'),
)
install_symlink(
f'valac@exe_ext@',
pointing_to: f'@valac_name@@exe_ext@',
install_dir: get_option('bindir'),
)
install_symlink(
f'vala@exe_ext@',
pointing_to: f'vala@vala_version_suffix@@exe_ext@',
install_dir: get_option('bindir'),
)
if host_machine.system() != 'windows'
install_symlink(
f'vala@vala_version_suffix@@exe_ext@',
pointing_to: f'@valac_name@@exe_ext@',
install_dir: get_option('bindir'),
)
install_symlink(
f'valac@exe_ext@',
pointing_to: f'@valac_name@@exe_ext@',
install_dir: get_option('bindir'),
)
install_symlink(
f'vala@exe_ext@',
pointing_to: f'vala@vala_version_suffix@@exe_ext@',
install_dir: get_option('bindir'),
)
endif
16 changes: 9 additions & 7 deletions doc/meson.build
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
install_man(['vala-gen-introspect.1', 'valac.1', 'valadoc.1', 'vapigen.1'])

foreach page : ['vala-gen-introspect', 'valac', 'valadoc', 'vapigen']
install_symlink(
f'@page@@vala_version_suffix@.1',
pointing_to: f'@page@.1',
install_dir: get_option('mandir') / 'man1',
)
endforeach
if host_machine.system() != 'windows'
foreach page : ['vala-gen-introspect', 'valac', 'valadoc', 'vapigen']
install_symlink(
f'@page@@vala_version_suffix@.1',
pointing_to: f'@page@.1',
install_dir: get_option('mandir') / 'man1',
)
endforeach
endif
12 changes: 7 additions & 5 deletions valadoc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ executable(
install: true,
)

install_symlink(
'valadoc',
pointing_to: f'@valadoc_name@@exe_ext@',
install_dir: get_option('bindir'),
)
if host_machine.system() != 'windows'
install_symlink(
'valadoc',
pointing_to: f'@valadoc_name@@exe_ext@',
install_dir: get_option('bindir'),
)
endif

subdir('doclets')
subdir('icons')
24 changes: 14 additions & 10 deletions vapigen/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ vapigen_exe = executable(
install: true,
)

install_symlink(
f'vapigen@exe_ext@',
pointing_to: f'@vapigen_name@@exe_ext@',
install_dir: get_option('bindir'),
)
if host_machine.system() != 'windows'
install_symlink(
f'vapigen@exe_ext@',
pointing_to: f'@vapigen_name@@exe_ext@',
install_dir: get_option('bindir'),
)
endif

vapicheck_sources = [
'valavapicheck.vala',
Expand All @@ -37,11 +39,13 @@ executable(
vala_args: ['--pkg', 'gidl', '--vapidir', meson.project_source_root() / 'gobject-introspection'],
)

install_symlink(
f'vapicheck@exe_ext@',
pointing_to: f'@vapicheck_name@@exe_ext@',
install_dir: get_option('bindir'),
)
if host_machine.system() != 'windows'
install_symlink(
f'vapicheck@exe_ext@',
pointing_to: f'@vapicheck_name@@exe_ext@',
install_dir: get_option('bindir'),
)
endif

configure_file(
input: 'vapigen.pc.in',
Expand Down
12 changes: 7 additions & 5 deletions vapigen/vala-gen-introspect/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ configure_file(
install_dir: get_option('prefix') / get_option('bindir'),
)

install_symlink(
'vala-gen-introspect',
pointing_to: vala_gen_introspect_name,
install_dir: get_option('bindir'),
)
if host_machine.system() != 'windows'
install_symlink(
'vala-gen-introspect',
pointing_to: vala_gen_introspect_name,
install_dir: get_option('bindir'),
)
endif

0 comments on commit 45e8993

Please sign in to comment.