[Build System: build-script] Remove the old arguments module hiding in swift_build_support in favor of the more featureful one living in build_swift.

Author: Ross Bayer

utils/build-script

@@ -11,21 +11,20 @@
 
 from __future__ import print_function
 
-import argparse
 import json
 import os
 import pipes
 import platform
 import sys
 import time
 
+from build_swift.build_swift import argparse
 from build_swift.build_swift import defaults
 from build_swift.build_swift import driver_arguments
 from build_swift.build_swift import presets
 from build_swift.build_swift.migration import migrate_swift_sdks
 
 from swift_build_support.swift_build_support import (
-    arguments,
     debug,
     diagnostics,
     migration,
@@ -907,11 +906,13 @@ def main_preset():
     parser.add_argument(
         "--show-presets",
         help="list all presets and exit",
-        action=arguments.action.optional_bool)
+        action=argparse.actions.StoreTrueAction,
+        nargs=argparse.Nargs.OPTIONAL)
     parser.add_argument(
         "--distcc",
         help="use distcc",
-        action=arguments.action.optional_bool)
+        action=argparse.actions.StoreTrueAction,
+        nargs=argparse.Nargs.OPTIONAL)
     parser.add_argument(
         "--cmake-c-launcher",
         help="the absolute path to set CMAKE_C_COMPILER_LAUNCHER",
@@ -934,7 +935,8 @@ def main_preset():
         "--expand-invocation", "--expand-build-script-invocation",
         help="Print the expanded build-script invocation generated "
              "by the preset, but do not run the preset",
-        action=arguments.action.optional_bool)
+        action=argparse.actions.StoreTrueAction,
+        nargs=argparse.Nargs.OPTIONAL)
     parser.add_argument(
         "--swiftsyntax-install-prefix",
         help="specify the directory to where SwiftSyntax should be installed")

utils/run-test

@@ -11,16 +11,14 @@
 
 from __future__ import print_function
 
-import argparse
 import multiprocessing
 import os
 import shutil
 import sys
 
-from swift_build_support.swift_build_support import (
-    arguments,
-    shell
-)
+from build_swift.build_swift import argparse
+
+from swift_build_support.swift_build_support import shell
 from swift_build_support.swift_build_support.SwiftBuildSupport import \
     SWIFT_SOURCE_ROOT
 from swift_build_support.swift_build_support.targets import \
@@ -131,8 +129,8 @@ def main():
                         help="build test dependencies before running tests "
                              "(default: true)")
     parser.add_argument("--target",
-                        type=arguments.type.shell_split,
-                        action=arguments.action.concat,
+                        type=argparse.types.ShellSplitType,
+                        action=argparse.actions.AppendAction,
                         dest="targets",
                         help="stdlib deployment targets to test. Accept "
                              "multiple (default: " + host_target + ")")
@@ -143,8 +141,8 @@ def main():
                         choices=TEST_SUBSETS, default='primary',
                         help="test subset (default: primary)")
     parser.add_argument("--param",
-                        type=arguments.type.shell_split,
-                        action=arguments.action.concat,
+                        type=argparse.types.ShellSplitType,
+                        action=argparse.actions.AppendAction,
                         default=[],
                         help="key=value parameters they are directly passed "
                              "to lit command in addition to `mode` and "

utils/swift_build_support/swift_build_support/arguments.py

@@ -2,9 +2,11 @@
 
 set -e
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+UTILS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+SWIFT_BUILD_SUPPORT_DIR="${UTILS_DIR}/swift_build_support"
 
-python -m unittest discover -s $DIR
+env PYTHONPATH="${UTILS_DIR}":$PYTHONPATH \
+	python -m unittest discover -s "${SWIFT_BUILD_SUPPORT_DIR}"
 
 set +e