[bootstrap] Add swift-argument-parser as a swift-driver dependency

Author: owenv

CMakeLists.txt

@@ -43,6 +43,7 @@ find_package(dispatch QUIET)
 find_package(Foundation QUIET)
 
 find_package(Yams CONFIG REQUIRED)
+find_package(ArgumentParser CONFIG REQUIRED)
 find_package(SwiftDriver CONFIG REQUIRED)
 
 add_subdirectory(Sources)

Sources/Build/CMakeLists.txt

@@ -20,6 +20,7 @@ target_link_libraries(Build PUBLIC
   SPMBuildCore
   CYaml
   Yams
+  ArgumentParser
   SwiftDriver)
 
 # NOTE(compnerd) workaround for CMake not setting up include flags yet

Utilities/bootstrap

@@ -151,6 +151,7 @@ def parse_global_args(args):
     args.project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     args.tsc_source_dir = os.path.join(args.project_root, "swift-tools-support-core")
     args.yams_source_dir = os.path.join(args.project_root, "..", "yams")
+    args.swift_argument_parser_source_dir = os.path.join(args.project_root, "..", "swift-argument-parser")
     args.swift_driver_source_dir = os.path.join(args.project_root, "..", "swift-driver")
     args.source_root = os.path.join(args.project_root, "Sources")
 
@@ -278,6 +279,7 @@ def build(args):
 
     build_tsc(args)
     build_yams(args)
+    build_swift_argument_parser(args)
     build_swift_driver(args)
     build_swiftpm_with_cmake(args)
     build_swiftpm_with_swiftpm(args)
@@ -460,6 +462,17 @@ def build_yams(args):
 
     build_with_cmake(args, cmake_flags, args.yams_source_dir, args.yams_build_dir)
 
+def build_swift_argument_parser(args):
+    note("Building swift-argument-parser")
+    args.swift_argument_parser_build_dir = os.path.join(args.target_dir, "swift-argument-parser")
+
+    cmake_flags = []
+    if platform.system() == 'Darwin':
+        cmake_flags.append("-DCMAKE_OSX_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target)
+
+    cmake_flags.append("-DBUILD_TESTING=NO")
+    build_with_cmake(args, cmake_flags, args.swift_argument_parser_source_dir, args.swift_argument_parser_build_dir)
+
 def build_swift_driver(args):
     note("Building SwiftDriver")
     args.swift_driver_build_dir = os.path.join(args.target_dir, "swift-driver")
@@ -468,6 +481,7 @@ def build_swift_driver(args):
         get_llbuild_cmake_arg(args),
         "-DTSC_DIR=" + os.path.join(args.tsc_build_dir, "cmake/modules"),
         "-DYams_DIR=" + os.path.join(args.yams_build_dir, "cmake/modules"),
+        "-DArgumentParser_DIR=" + os.path.join(args.swift_argument_parser_build_dir, "cmake/modules"),
     ]
     if platform.system() == 'Darwin':
         cmake_flags.append("-DCMAKE_C_FLAGS=-target x86_64-apple-macosx%s" % g_macos_deployment_target)
@@ -490,6 +504,7 @@ def build_swiftpm_with_cmake(args):
         get_llbuild_cmake_arg(args),
         "-DTSC_DIR=" + os.path.join(args.tsc_build_dir, "cmake/modules"),
         "-DYams_DIR=" + os.path.join(args.yams_build_dir, "cmake/modules"),
+        "-DArgumentParser_DIR=" + os.path.join(args.swift_argument_parser_build_dir, "cmake/modules"),
         "-DSwiftDriver_DIR=" + os.path.join(args.swift_driver_build_dir, "cmake/modules"),
     ]
 
@@ -504,6 +519,7 @@ def build_swiftpm_with_cmake(args):
 
     if platform.system() == "Darwin":
         add_rpath_for_cmake_build(args, os.path.join(args.yams_build_dir, "lib"))
+        add_rpath_for_cmake_build(args, os.path.join(args.swift_argument_parser_build_dir, "lib"))
         add_rpath_for_cmake_build(args, os.path.join(args.swift_driver_build_dir, "lib"))
 
 def build_swiftpm_with_swiftpm(args):
@@ -585,6 +601,7 @@ def get_swiftpm_env_cmd(args):
         os.path.join(args.tsc_build_dir, "lib"),
         os.path.join(args.llbuild_build_dir, "lib"),
         os.path.join(args.yams_build_dir, "lib"),
+        os.path.join(args.swift_argument_parser_build_dir, "lib"),
         os.path.join(args.swift_driver_build_dir, "lib"),
     ])