Merge pull request #590 from nkcsgexi/oss-setup

cmake: set up build-script support for swift-build-sdk-interfaces

Author: nkcsgexi

Sources/CMakeLists.txt

@@ -10,5 +10,6 @@ add_subdirectory(CSwiftScan)
 add_subdirectory(SwiftOptions)
 add_subdirectory(SwiftDriver)
 add_subdirectory(SwiftDriverExecution)
+add_subdirectory(swift-build-sdk-interfaces)
 add_subdirectory(swift-driver)
 add_subdirectory(swift-help)

Sources/swift-build-sdk-interfaces/CMakeLists.txt

@@ -0,0 +1,13 @@
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+add_executable(swift-build-sdk-interfaces
+  main.swift)
+target_link_libraries(swift-build-sdk-interfaces PUBLIC
+  SwiftDriver
+  SwiftDriverExecution)

Sources/swift-build-sdk-interfaces/main.swift

@@ -1,3 +1,14 @@
+//===--------------- main.swift - swift-build-sdk-interfaces ------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
 import SwiftDriverExecution
 import SwiftDriver
 import TSCLibc

Utilities/build-script-helper.py

@@ -27,6 +27,8 @@ def error(message):
 driver_toolchain_tools = ['swift', 'swift-frontend', 'clang', 'swift-help',
                           'swift-autolink-extract', 'lldb']
 
+executables_to_install = ['swift-driver', 'swift-help', 'swift-build-sdk-interfaces']
+
 def mkdir_p(path):
     """Create the given directory, if it does not exist."""
     try:
@@ -211,7 +213,7 @@ def handle_invocation(args):
 # TODO: Unify CMake-based installation flow used on Darwin with this
 def non_darwin_install(swiftpm_bin_path, toolchain, verbose):
   toolchain_bin = os.path.join(toolchain, 'bin')
-  for exe in ['swift-driver', 'swift-help']:
+  for exe in executables_to_install:
     install_binary(exe, swiftpm_bin_path, toolchain_bin, verbose)
 
 def install(args, build_dir, targets):
@@ -250,7 +252,7 @@ def install_swiftdriver(args, build_dir, prefix, targets) :
 # Install universal binaries for swift-driver and swift-help into the toolchain bin
 # directory
 def install_executables(args, build_dir, universal_bin_dir, toolchain_bin_dir, targets):
-  for exe in ['swift-driver', 'swift-help']:
+  for exe in executables_to_install:
     # Fixup rpaths
     for target in targets:
       exe_bin_path = os.path.join(build_dir, target,