osxbundle: read version from version.h

osxbundle.py currently reads the version number from MPV_VERSION, while
Meson first tries git describe before falling back to MPV_VERSION.
Update osxbundle.py to try reading the version number from version.h
before falling back to MPV_VERSION. This ensures that the version number
in the bundle matches the output of mpv --version.

Author: al3xtjames

TOOLS/osxbundle.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import fileinput
 import os
+import re
 import shutil
 import subprocess
 from optparse import OptionParser
@@ -48,10 +49,15 @@ def sign_bundle(binary_name):
                 subprocess.run(["codesign", "--force", "-s", "-", path])
     subprocess.run(["codesign", "--force", "-s", "-", bundle_path(binary_name)])
 
-def bundle_version(src_path):
+def bundle_version(build_path, src_path):
     version = "UNKNOWN"
+    version_h_path = os.path.join(build_path, "common", "version.h")
     version_path = os.path.join(src_path, "MPV_VERSION")
-    if os.path.exists(version_path):
+    if os.path.exists(version_h_path):
+        x = open(version_h_path)
+        version = re.findall(r"#define\s+VERSION\s+\"v(.+)\"", x.read())[0]
+        x.close()
+    elif os.path.exists(version_path):
         x = open(version_path)
         version = x.read()
         x.close()
@@ -70,9 +76,10 @@ def main():
         parser.error("incorrect number of arguments")
     else:
         binary_name = args[0]
+        build_path = os.path.dirname(binary_name)
         src_path = args[1] if len(args) > 1 else "."
 
-    version = bundle_version(src_path).rstrip()
+    version = bundle_version(build_path, src_path).rstrip()
 
     print(f"Creating macOS application bundle (version: {version})...")
     print("> copying bundle skeleton")

meson.build

@@ -1830,7 +1830,7 @@ if get_option('cplayer')
         osxbundle = find_program(join_paths(tools_directory, 'osxbundle.py'), required: true)
         custom_target('macos-bundle',
             output: 'mpv.app',
-            command: [osxbundle, mpv.full_path(), '@SOURCE_ROOT@'],
+            command: [osxbundle, mpv, '@SOURCE_ROOT@'],
         )
     endif