summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2023-01-04 13:13:59 +0100
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2023-01-04 13:13:59 +0100
commit0ae10b37bea9b2f7b8580042ddbb4244c4e9b6e4 (patch)
tree69edd90d277a06b4eb057b5831d3d76621c5bfeb
parent7fe453eefbd11ac0e1f02b08e957c53fae469a5d (diff)
meson.build: Fix the evaluation of is_git_build on Windows
See gtkmm#131
-rw-r--r--meson.build15
1 files changed, 10 insertions, 5 deletions
diff --git a/meson.build b/meson.build
index 6f727b0..e8a90ac 100644
--- a/meson.build
+++ b/meson.build
@@ -57,12 +57,17 @@ endif
# Suppose we do if and only if the meson.build file is tracked by git.
cmd_py = '''
import shutil, subprocess, sys
-if not shutil.which('git'):
+git_exe = shutil.which('git')
+if not git_exe:
sys.exit(1)
-cmd = [ 'git', 'ls-files', '--error-unmatch', 'meson.build' ]
-sys.exit(subprocess.run(cmd, cwd="@0@", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode)
-'''.format(project_source_root)
-is_git_build = run_command(python3, '-c', cmd_py, check: false).returncode() == 0
+cmd = [ git_exe, 'ls-files', '--error-unmatch', 'meson.build' ]
+sys.exit(subprocess.run(cmd, cwd=sys.argv[1], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode)
+'''
+is_git_build = run_command(
+ python3, '-c', cmd_py,
+ project_source_root,
+ check: false,
+).returncode() == 0
# Are we testing a dist tarball while it's being built?
# There ought to be a better way. https://github.com/mesonbuild/meson/issues/6866