files() not needed, write some more debug info

pace-neutrons · Dec 9, 2024 · deea1e1 · deea1e1
1 parent 34cd1bd
commit deea1e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build_utils/version.py b/build_utils/version.py
@@ -39,12 +39,13 @@
 
 for gitcmd in gits:
     try:
+        print(f"Trying {gitcmd} ...")
         proc = subprocess.run([gitcmd, "describe", "--tags", "--dirty"],
                               capture_output=True, check=True, text=True)
     except subprocess.CalledProcessError as err:
         print(f"Tried {gitcmd}, returned: {err}", file=sys.stderr)
         print(f"Stdout: '{err.stdout.strip()}'", file=sys.stderr)
-        print(f"Stdout: '{err.stderr.strip()}'", file=sys.stderr)
+        print(f"Stderr: '{err.stderr.strip()}'", file=sys.stderr)
         continue
 
     version, *dirty = proc.stdout.strip().split("-")
@@ -53,6 +54,7 @@
     break
 
 else:  # Can't use git
+    print(f"All git implementations failed, reading version file")
     version = version_file.read_text().split("=")[1].strip('"\n ')
 
 match COMMAND:

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('euphonic',
         'c',
-        version: run_command('python', files('build_utils/version.py'), check: true).stdout().strip(),
+        version: run_command('python', 'build_utils/version.py', check: true).stdout().strip(),
         meson_version: '>=1.6',
        )