[build-script] Validate and parse '--clang-compiler-version' in argparse

Author: rintaro

utils/build-script

@@ -15,6 +15,7 @@ import argparse
 import multiprocessing
 import os
 import platform
+import re
 import shutil
 import sys
 import pipes
@@ -76,6 +77,16 @@ def argparse_shell_split(string):
     return list(lex)
 
 
+# Parse version string and split into a tuple of strings (major, minor, patch)
+# Support only "MAJOR.MINOR.PATCH" format.
+def argparse_clang_compiler_version(string):
+    m = re.match(r'([0-9]*)\.([0-9]*)\.([0-9]*)', string)
+    if m is not None:
+        return m.group(1, 2, 3)
+    raise argparse.ArgumentTypeError(
+        "%r is invalid version value. must be 'MAJOR.MINOR.PATCH'" % string)
+
+
 # Main entry point for the preset mode.
 def main_preset():
     parser = argparse.ArgumentParser(
@@ -838,6 +849,7 @@ details of the setups of other systems or automated environments.""")
     parser.add_argument(
         "--clang-compiler-version",
         help="string that indicates a compiler version for Clang",
+        type=argparse_clang_compiler_version,
         metavar="MAJOR.MINOR.PATCH")
 
     parser.add_argument(
@@ -1286,7 +1298,7 @@ details of the setups of other systems or automated environments.""")
         build_script_impl_args += ["--enable-ubsan"]
     if args.clang_compiler_version:
         build_script_impl_args += [
-            "--clang-compiler-version", args.clang_compiler_version
+            "--clang-compiler-version=%s.%s.%s" % args.clang_compiler_version
         ]
     if args.verbose_build:
         build_script_impl_args += ["--verbose-build"]

utils/swift_build_support/swift_build_support/cmake.py

@@ -16,7 +16,6 @@
 
 from numbers import Number
 import platform
-import re
 import subprocess
 
 from . import xcrun
@@ -129,12 +128,10 @@ def common_options(self):
                    "Debug;Release;MinSizeRel;RelWithDebInfo")
 
         if args.clang_compiler_version:
-            m = re.match(r'([0-9]*)\.([0-9]*)\.([0-9]*)',
-                         args.clang_compiler_version)
-            if m is not None:
-                define("LLVM_VERSION_MAJOR:STRING", m.group(1))
-                define("LLVM_VERSION_MINOR:STRING", m.group(2))
-                define("LLVM_VERSION_PATCH:STRING", m.group(3))
+            major, minor, patch = args.clang_compiler_version
+            define("LLVM_VERSION_MAJOR:STRING", major)
+            define("LLVM_VERSION_MINOR:STRING", minor)
+            define("LLVM_VERSION_PATCH:STRING", patch)
 
         return options
 

utils/swift_build_support/tests/test_cmake.py

@@ -141,7 +141,7 @@ def test_common_options_xcode(self):
 
     def test_common_options_clang_compiler_version(self):
         args = self.default_args()
-        args.clang_compiler_version = "3.8.0"
+        args.clang_compiler_version = ("3", "8", "0")
         cmake = self.cmake(args)
         self.assertEqual(
             list(cmake.common_options()),
@@ -159,7 +159,7 @@ def test_common_options_full(self):
         args.export_compile_commands = True
         args.distcc = True
         args.cmake_generator = 'Xcode'
-        args.clang_compiler_version = "3.8.0"
+        args.clang_compiler_version = ("3", "8", "0")
         cmake = self.cmake(args)
         self.assertEqual(
             list(cmake.common_options()),