[vala/meson-msvc: 15/15] WIP: Don't use ln on MSVC bulids
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/meson-msvc: 15/15] WIP: Don't use ln on MSVC bulids
- Date: Wed, 26 Jan 2022 05:35:21 +0000 (UTC)
commit 3965645fe2033427ff8b570c962545cfecba1658
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Jan 26 13:10:26 2022 +0800
WIP: Don't use ln on MSVC bulids
They don't work on cmd.exe consoles...
compiler/meson.build | 8 +++++---
doc/meson.build | 12 +++++++-----
vapigen/meson.build | 8 ++++++--
vapigen/vala-gen-introspect/meson.build | 4 +++-
4 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/compiler/meson.build b/compiler/meson.build
index d2761a44d..0dc69d1f3 100644
--- a/compiler/meson.build
+++ b/compiler/meson.build
@@ -21,6 +21,8 @@ valac_exe = executable(
vala_name = 'vala@0@'.format(vala_version_suffix)
# https://github.com/mesonbuild/meson/issues/1602
-meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs --relative @1@
valac'.format(join_paths(get_option('prefix'), get_option('bindir')), valac_name))
-meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs --relative @1@
@2@'.format(join_paths(get_option('prefix'), get_option('bindir')), valac_name, vala_name))
-meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs --relative @1@
vala'.format(join_paths(get_option('prefix'), get_option('bindir')), valac_name))
+if cc.get_argument_syntax() != 'msvc'
+ meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs --relative @1@
valac'.format(join_paths(get_option('prefix'), get_option('bindir')), valac_name))
+ meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs --relative @1@
@2@'.format(join_paths(get_option('prefix'), get_option('bindir')), valac_name, vala_name))
+ meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs --relative @1@
vala'.format(join_paths(get_option('prefix'), get_option('bindir')), valac_name))
+endif
diff --git a/doc/meson.build b/doc/meson.build
index c5763e518..bf6bbab2b 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -56,11 +56,13 @@ else
endif
# https://github.com/mesonbuild/meson/issues/1602
-meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@/man1; ln -fs --relative vala-gen-introspect.1
@1@'.format(join_paths(get_option('prefix'), get_option('mandir')),
'vala-gen-introspect@0@.1'.format(vala_version_suffix)))
-meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@/man1; ln -fs --relative valac.1
@1@'.format(join_paths(get_option('prefix'), get_option('mandir')), 'valac@0@.1'.format(vala_version_suffix)))
-meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@/man1; ln -fs --relative vapigen.1
@1@'.format(join_paths(get_option('prefix'), get_option('mandir')),
'vapigen@0@.1'.format(vala_version_suffix)))
-if valadoc_enabled
- meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@/man1; ln -fs --relative valadoc.1
@1@'.format(join_paths(get_option('prefix'), get_option('mandir')),
'valadoc@0@.1'.format(vala_version_suffix)))
+if cc.get_argument_syntax() != 'msvc'
+ meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@/man1; ln -fs --relative vala-gen-introspect.1
@1@'.format(join_paths(get_option('prefix'), get_option('mandir')),
'vala-gen-introspect@0@.1'.format(vala_version_suffix)))
+ meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@/man1; ln -fs --relative valac.1
@1@'.format(join_paths(get_option('prefix'), get_option('mandir')), 'valac@0@.1'.format(vala_version_suffix)))
+ meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@/man1; ln -fs --relative vapigen.1
@1@'.format(join_paths(get_option('prefix'), get_option('mandir')),
'vapigen@0@.1'.format(vala_version_suffix)))
+ if valadoc_enabled
+ meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@/man1; ln -fs --relative valadoc.1
@1@'.format(join_paths(get_option('prefix'), get_option('mandir')),
'valadoc@0@.1'.format(vala_version_suffix)))
+ endif
endif
if valadoc_enabled
diff --git a/vapigen/meson.build b/vapigen/meson.build
index df3e18c5a..fb27b73c5 100644
--- a/vapigen/meson.build
+++ b/vapigen/meson.build
@@ -14,7 +14,9 @@ vapigen_exe = executable(
)
# https://github.com/mesonbuild/meson/issues/1602
-meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs --relative @1@
vapigen'.format(join_paths(get_option('prefix'), get_option('bindir')), vapigen_name))
+if cc.get_argument_syntax() != 'msvc'
+ meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs --relative @1@
vapigen'.format(join_paths(get_option('prefix'), get_option('bindir')), vapigen_name))
+endif
vapicheck_sources = files(
'valavapicheck.vala',
@@ -31,7 +33,9 @@ executable(
)
# https://github.com/mesonbuild/meson/issues/1602
-meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs --relative @1@
vapicheck'.format(join_paths(get_option('prefix'), get_option('bindir')), vapicheck_name))
+if cc.get_argument_syntax() != 'msvc'
+ meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs --relative @1@
vapicheck'.format(join_paths(get_option('prefix'), get_option('bindir')), vapicheck_name))
+endif
configure_file(
input: 'vapigen.pc.in',
diff --git a/vapigen/vala-gen-introspect/meson.build b/vapigen/vala-gen-introspect/meson.build
index 79ab97379..82ff86586 100644
--- a/vapigen/vala-gen-introspect/meson.build
+++ b/vapigen/vala-gen-introspect/meson.build
@@ -6,4 +6,6 @@ vala_gen_introspect_sh = configure_file(
)
# https://github.com/mesonbuild/meson/issues/1602
-meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs @1@
vala-gen-introspect'.format(join_paths(get_option('prefix'), get_option('bindir')),
'vala-gen-introspect@0@'.format(vala_version_suffix)))
+if cc.get_argument_syntax() != 'msvc'
+ meson.add_install_script('sh', '-c', 'cd $DESTDIR@0@; ln -fs @1@
vala-gen-introspect'.format(join_paths(get_option('prefix'), get_option('bindir')),
'vala-gen-introspect@0@'.format(vala_version_suffix)))
+endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]