[gjs/meson.msvc: 2/8] meson.build: Don't run build/choose-tests-locale.sh
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/meson.msvc: 2/8] meson.build: Don't run build/choose-tests-locale.sh
- Date: Mon, 28 Oct 2019 09:16:44 +0000 (UTC)
commit 138296169a141dd34c0d7e8da1dfb330985e782c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Oct 25 12:38:12 2019 +0800
meson.build: Don't run build/choose-tests-locale.sh
This is not applicable for MSVC builds, as MSVC builds are done in a
standard Windows cmd.exe console, not a BASH-style console.
Instead, just set LC_ALL to C.UTF-8 for MSVC builds.
meson.build | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 1d8179c6..29ac078b 100644
--- a/meson.build
+++ b/meson.build
@@ -307,7 +307,10 @@ configure_file(input: 'win32/config.h.win32.in', output: 'config.h.win32',
### Check for environment ######################################################
-tests_locale = run_command('build/choose-tests-locale.sh').stdout().strip()
+# Not applicable for cmd.exe shells that MSVC uses
+if cxx.get_id() != 'msvc'
+ tests_locale = run_command('build/choose-tests-locale.sh').stdout().strip()
+endif
gjsjsdir = get_option('datadir') / api_name
pkglibexecdir = get_option('libexecdir') / meson.project_name()
@@ -570,7 +573,13 @@ tests_environment.set('G_FILENAME_ENCODING', 'latin1')
tests_environment.set('LSAN_OPTIONS', 'suppressions=@0@'.format(
meson.current_source_dir() / 'installed-tests' / 'extra' / 'lsan.supp'))
tests_environment.set('NO_AT_BRIDGE', '1')
-tests_environment.set('LC_ALL', tests_locale)
+
+if cc.get_id() == 'msvc'
+ tests_environment.set('LC_ALL', 'C.UTF-8')
+else
+ tests_environment.set('LC_ALL', tests_locale)
+endif
+
tests_environment.set('GSETTINGS_SCHEMA_DIR', js_tests_builddir)
tests_environment.set('G_DEBUG', 'fatal-warnings,fatal-criticals')
@@ -632,7 +641,7 @@ gobject-introspection to run the tests. You can still build GJS, but some
tests will fail.''')
endif
-if tests_locale == 'C'
+if cxx.get_id() != 'msvc' and tests_locale == 'C'
warning('''Your libc does not have the C.UTF-8 locale and no other
suitable UTF-8 fallback locale could be found. You can still build GJS, but
some tests will fail.''')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]