Keep the vendor (Android or Apple) in Clang version

Author: vstinner

Lib/test/test_tools/test_getbuildinfo.py

@@ -1,4 +1,4 @@
-"""Tests Tools/build/generate_getbuildinfo.py."""
+"""Test Tools/build/generate_getbuildinfo.py."""
 
 import locale
 import os
@@ -71,11 +71,11 @@ def test_get_compiler(self):
         MOCK_COMPILER = 'MOCK_COMPILER'
 
         for hostrunner in ('', 'node'):
+            makefile_vars = {
+                'HOSTRUNNER': hostrunner,
+                'CC': 'gcc -std=c11',
+            }
             for use_cc in (False, True):
-                makefile_vars = {
-                    'HOSTRUNNER': hostrunner,
-                    'CC': 'gcc -std=c11',
-                }
                 with mock.patch.object(generate_getbuildinfo,
                                        'get_makefile_vars',
                                        return_value=makefile_vars):
@@ -101,22 +101,22 @@ def test_get_compiler(self):
                         else:
                             mock_run_command.assert_called_once_with(cmd, check=False)
 
-    def test_shorter_clang_version(self):
-        shorter_clang_version = generate_getbuildinfo.shorter_clang_version
+    def test_compact_compiler(self):
+        compact_compiler = generate_getbuildinfo.compact_compiler
 
         def check(compiler, expected):
-            self.assertEqual(shorter_clang_version(compiler), expected)
+            self.assertEqual(compact_compiler(compiler), expected)
 
         def check_unchanged(compiler):
-            self.assertEqual(shorter_clang_version(compiler), compiler)
+            self.assertEqual(compact_compiler(compiler), compiler)
 
         compiler = (
             'Android (13691557, +pgo, +bolt, +lto, +mlgo, based on r522817d) '
             'clang version 18.0.4 '
             '(https://android.googlesource.com/toolchain/llvm-project'
             ' d8003a456d14a3deb8054cdaa529ffbf02d9b262)'
         )
-        check(compiler, 'Clang 18.0.4')
+        check(compiler, 'Android Clang 18.0.4')
 
         compiler = (
             'Clang 18.0.4 '
@@ -132,8 +132,16 @@ def check_unchanged(compiler):
         )
         check(compiler, 'Clang 24.0.0git')
 
-        check_unchanged('Clang 21.0.0 (clang-2100.1.1.101)')
-        check_unchanged('Apple clang version 21.0.0 (clang-2100.1.1.101)')
+        check('Clang 21.0.0 (clang-2100.1.1.101)',
+              'Clang 21.0.0')
+        check('Apple clang version 21.0.0 (clang-2100.1.1.101)',
+              'Apple Clang 21.0.0')
+        check('Custom Vendor (something) Clang 22.1.0+dev',
+              'Custom Vendor Clang 22.1.0+dev')
+
+        check_unchanged('GCC 16.2.1 20260819 (Red Hat 16.2.1-2)')
+        check_unchanged('GCC 15.2.0')
+        check_unchanged('MSC v.1951 32 bit (Intel)')
 
     def test_functional(self):
         old_locale = locale.setlocale(locale.LC_ALL)

PCbuild/pcbuild.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 18
-VisualStudioVersion = 18.10.12224.181 stable
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34525.116
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"
 	ProjectSection(SolutionItems) = preProject

Tools/build/generate_getbuildinfo.py

@@ -17,13 +17,16 @@
 # Get PY_VERSION from Include/patchlevel.h
 PY_VERSION_REGEX = re.compile(r'^#define PY_VERSION +"(.*)"$', re.MULTILINE)
 
-# Parse verbose Clang version (truncated here with '...'):
-# 'Clang 24.0.0git (https:/github.com/llvm/llvm-project a06...8bf)'
-# 'Android (13691557, +pgo, ...) clang version 18.0.4 (https://android.googlesource.com/toolchain/llvm-project d80...262)'
-CLANG_VERBOSE_VERSION = re.compile(r'(Clang .*|clang version .*) \(https:/.*\)')
-
-# Parse short Clang version: 'clang version 18.0.4'
-CLANG_SHORT_VERSION = re.compile(r'clang version (.*)')
+# Parse Clang version (truncated examples using '...'):
+# 'Clang 21.0.0 (clang-2100.1.1.101)'
+# 'clang version 18.0.4'
+# 'Apple clang version 21.0.0 (clang-2100.1.1.101)'
+# 'Clang 18.0.4 (https://android.googlesource.com/toolchain/llvm-project d80...62)'
+CLANG_VERSION_REGEX = re.compile(
+    r'(?:([A-Za-z_-][A-Za-z_ -]+) .*)?'  # Vendor name: 'Android' or 'Apple'
+    r'(?:Clang|clang version) '          # 'Clang' or 'clang version'
+    r'([0-9]+\.[0-9a-z.+]+)'             # version
+)
 
 
 def exit_error(msg):
@@ -48,7 +51,7 @@ def get_makefile_vars():
     return sysconfig.__main__._parse_makefile(makefile)
 
 
-def get_gil_disable():
+def get_gil_disabled():
     # Look in the current working directory
     pyconfig_h = 'pyconfig.h'
     with open(pyconfig_h, encoding="utf-8") as fp:
@@ -83,8 +86,7 @@ def get_build_info(git_tag, git_branch, git_version):
         git_id = "main"
 
     sep = ":" if git_version else ""
-
-    build_info = f"{git_id}{sep}{git_version}, {build_date:.20s}, {build_time:.9s}"
+    build_info = f"{git_id}{sep}{git_version}, {build_date}, {build_time}"
     return (build_info, git_id)
 
 
@@ -140,7 +142,7 @@ def _get_compiler():
     if compiler:
         return compiler
 
-    # Running _getcompiler failed, run directly the compiler (--version)
+    # Running _getcompiler failed, run the compiler with --version
     CC = makefile_vars.get('CC')
     if not CC:
         exit_error(f"ERROR: Unable to locate CC in Makefile")
@@ -154,16 +156,15 @@ def _get_compiler():
     return None
 
 
-def shorter_clang_version(compiler):
-    # Make verbose Clang version shorter: strip the prefix and URL
-    match = CLANG_VERBOSE_VERSION.search(compiler)
+def compact_compiler(compiler):
+    match = CLANG_VERSION_REGEX.search(compiler)
     if match:
-        compiler = match.group(1)
-
-    # Use a full match: don't replace 'Apple clang version 21.0.0' for example
-    match = CLANG_SHORT_VERSION.fullmatch(compiler)
-    if match:
-        compiler = 'Clang ' + match.group(1)
+        vendor = match.group(1)
+        version = match.group(2)
+        if vendor:
+            compiler = f'{vendor} Clang {version}'
+        else:
+            compiler = f'Clang {version}'
 
     return compiler
 
@@ -176,7 +177,7 @@ def get_compiler(compiler):
         # (see Programs/_getcompiler.c)
         compiler = 'C'
 
-    compiler = shorter_clang_version(compiler)
+    compiler = compact_compiler(compiler)
 
     return f'[{compiler}]'
 
@@ -208,7 +209,7 @@ def main():
 
     if free_threading is None:
         # Get Py_GIL_DISABLED macro from pyconfig.h
-        free_threading = get_gil_disable()
+        free_threading = get_gil_disabled()
 
     if free_threading:
         version = f"{PY_VERSION} free-threading build ({build_info}) {compiler}"