Merge pull request swiftlang#472 from swiftlang/automerge/merge-main-2025-04-30_22-51

Merge `main` into `release/6.2`

Author: owenv

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/automerge.yml

@@ -0,0 +1,17 @@
+name: Create PR to merge main into release branch
+# In the first period after branching the release branch, we typically want to include many changes from `main` in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.
+# Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow. To do so, disable the workflow as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow
+on:
+  schedule:
+    - cron: '0 9 * * MON'
+  workflow_dispatch:
+jobs:
+  create_merge_pr:
+    name: Create PR to merge main into release branch
+    uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
+    with:
+      base_branch: release/6.2
+    permissions:
+      contents: write
+      pull-requests: write
+    if: (github.event_name == 'schedule' && github.repository == 'swiftlang/swift-build') || (github.event_name != 'schedule')  # Ensure that we don't run this on a schedule in a fork

.github/workflows/pull_request.yml

@@ -0,0 +1,29 @@
+name: Pull request
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  tests:
+    name: Test
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
+    with:
+      linux_os_versions: '["noble", "jammy", "focal", "rhel-ubi9"]'
+      linux_pre_build_command: command -v apt >/dev/null 2>&1 && apt update && apt install -y libsqlite3-dev libncurses-dev || (command -v yum >/dev/null 2>&1 && yum update -y && yum install -y sqlite-devel ncurses-devel)
+      linux_build_command: 'swift test --no-parallel'
+      linux_swift_versions: '["nightly-main", "nightly-6.2"]'
+      windows_swift_versions: '["nightly-main"]'
+      windows_build_command: 'swift test --no-parallel'
+  soundness:
+    name: Soundness
+    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
+    with:
+      license_header_check_project_name: "Swift"
+      api_breakage_check_enabled: false
+      unacceptable_language_check_enabled: false
+      format_check_enabled: false

.license_header_template

@@ -0,0 +1,11 @@
+@@===----------------------------------------------------------------------===@@
+@@
+@@ This source file is part of the Swift open source project
+@@
+@@ Copyright (c) YEARS 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 the list of Swift project authors
+@@
+@@===----------------------------------------------------------------------===@@

.licenseignore

@@ -0,0 +1,9 @@
+**/*.mlmodel
+**/*.pbxproj
+**/*.png
+**/*.xcworkspacedata
+**/Package.swift
+.dir-locals.el
+.editorconfig
+CODEOWNERS
+Package.swift

CMakeLists.txt

@@ -12,6 +12,18 @@ cmake_minimum_required(VERSION 3.26...3.29)
 project(SwiftBuild
   LANGUAGES C CXX Swift)
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+set(CMAKE_INSTALL_RPATH "$<IF:$<PLATFORM_ID:Darwin>,@loader_path/..,$ORIGIN>")
+set(CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH YES)
+
+set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL)
+set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
+
+option(BUILD_SHARED_LIBS "Build shared libraries by default" YES)
+
 set(CMAKE_C_VISIBILITY hidden)
 set(CMAKE_CXX_VISIBILITY hidden)
 set(CMAKE_CXX_STANDARD 17)
@@ -35,7 +47,33 @@ add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-package-name SwiftBuild>
                     # rdar://137809703
                     # "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-upcoming-feature RegionBasedIsolation>"
                     "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-upcoming-feature ExistentialAny>"
-                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-upcoming-feature InternalImportsByDefault>")
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-upcoming-feature InternalImportsByDefault>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-no-toolchain-stdlib-rpath>"
+                    # Turn off autolinking within this project to reduce linker overhead.
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBLibc>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBAndroidPlatform>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBApplePlatform>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBBuildService>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBCLibc>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBGenericUnixPlatform>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBTaskConstruction>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBUtil>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBUniversalPlatform>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBWindowsPlatform>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SwiftBuild>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBWebAssemblyPlatform>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBCSupport>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBMacro>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBProjectModel>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBTaskExecution>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBServiceCore>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBQNXPlatform>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBProtocol>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBLLBuild>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBCore>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBCAS>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBBuildSystem>"
+                    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolink-library -Xfrontend SWBCore>")
 
 # Prefer the static initialization for the plugins.
 add_compile_definitions(USE_STATIC_PLUGIN_INITIALIZATION)
@@ -50,3 +88,4 @@ find_package(Threads)
 find_package(SQLite3)
 
 add_subdirectory(Sources)
+add_subdirectory(cmake/modules)

CODEOWNERS

@@ -1,4 +1,4 @@
-* @jakepetroules @mirza-garibovic @mhrawdon @neonichu @owenv
+* @aciidgh @jakepetroules @mirza-garibovic @mhrawdon @neonichu @owenv
 *XCStrings* @matthewseaman @kulpreetchilana @jakepetroules @mirza-garibovic @mhrawdon @neonichu @owenv
 *StringCatalog* @matthewseaman @kulpreetchilana @jakepetroules @mirza-garibovic @mhrawdon @neonichu @owenv
-*Preview* @jonathanpenn @jakepetroules @mirza-garibovic @mhrawdon @neonichu @owenv
+*Preview* @jonathanpenn @jakepetroules @mirza-garibovic @mhrawdon @neonichu @owenv

Package.swift

@@ -135,6 +135,7 @@ let package = Package(
             swiftSettings: swiftSettings(languageMode: .v5)),
         .target(
             name: "SWBCSupport",
+            exclude: ["empty.swift"],
             publicHeadersPath: ".",
             cSettings: [
                 .define("_CRT_SECURE_NO_WARNINGS", .when(platforms: [.windows])),

Plugins/cmake-smoke-test/cmake-smoke-test.swift

@@ -17,48 +17,56 @@ import Foundation
 struct CMakeSmokeTest: CommandPlugin {
     func performCommand(context: PluginContext, arguments: [String]) async throws {
         var args = ArgumentExtractor(arguments)
-
         let hostOS = try OS.host()
 
+        guard args.extractFlag(named: "disable-sandbox") > 0 else {
+            throw Errors.missingRequiredOption("--disable-sandbox")
+        }
+
         guard let cmakePath = args.extractOption(named: "cmake-path").last else { throw Errors.missingRequiredOption("--cmake-path") }
         print("using cmake at \(cmakePath)")
         let cmakeURL = URL(filePath: cmakePath)
         guard let ninjaPath = args.extractOption(named: "ninja-path").last else { throw Errors.missingRequiredOption("--ninja-path") }
         print("using ninja at \(ninjaPath)")
         let ninjaURL = URL(filePath: ninjaPath)
-        guard let sysrootPath = args.extractOption(named: "sysroot-path").last else { throw Errors.missingRequiredOption("--sysroot-path") }
-        print("using sysroot at \(sysrootPath)")
+        let sysrootPath = args.extractOption(named: "sysroot-path").last
+        if let sysrootPath {
+            print("using sysroot at \(sysrootPath)")
+        }
 
         let moduleCachePath = context.pluginWorkDirectoryURL.appending(component: "module-cache").path()
 
         let swiftBuildURL = context.package.directoryURL
         let swiftBuildBuildURL = context.pluginWorkDirectoryURL.appending(component: "swift-build")
         print("swift-build: \(swiftBuildURL.path())")
 
-        let swiftToolsSupportCoreURL = try findSiblingRepository("swift-tools-support-core", swiftBuildURL: swiftBuildURL)
+        let swiftToolsSupportCoreURL = try findDependency("swift-tools-support-core", pluginContext: context)
         let swiftToolsSupportCoreBuildURL = context.pluginWorkDirectoryURL.appending(component: "swift-tools-support-core")
 
-        let swiftSystemURL = try findSiblingRepository("swift-system", swiftBuildURL: swiftBuildURL)
+        let swiftSystemURL = try findDependency("swift-system", pluginContext: context)
         let swiftSystemBuildURL = context.pluginWorkDirectoryURL.appending(component: "swift-system")
 
-        let llbuildURL = try findSiblingRepository("llbuild", swiftBuildURL: swiftBuildURL)
+        let llbuildURL = try findDependency("swift-llbuild", pluginContext: context)
         let llbuildBuildURL = context.pluginWorkDirectoryURL.appending(component: "llbuild")
 
-        let swiftArgumentParserURL = try findSiblingRepository("swift-argument-parser", swiftBuildURL: swiftBuildURL)
+        let swiftArgumentParserURL = try findDependency("swift-argument-parser", pluginContext: context)
         let swiftArgumentParserBuildURL = context.pluginWorkDirectoryURL.appending(component: "swift-argument-parser")
 
-        let swiftDriverURL = try findSiblingRepository("swift-driver", swiftBuildURL: swiftBuildURL)
+        let swiftDriverURL = try findDependency("swift-driver", pluginContext: context)
         let swiftDriverBuildURL = context.pluginWorkDirectoryURL.appending(component: "swift-driver")
 
         for url in [swiftToolsSupportCoreBuildURL, swiftSystemBuildURL, llbuildBuildURL, swiftArgumentParserBuildURL, swiftDriverBuildURL, swiftBuildBuildURL] {
             try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
         }
 
-        let sharedSwiftFlags = [
-            "-sdk", sysrootPath,
+        var sharedSwiftFlags = [
             "-module-cache-path", moduleCachePath
         ]
 
+        if let sysrootPath {
+            sharedSwiftFlags += ["-sdk", sysrootPath]
+        }
+
         let cMakeProjectArgs = [
             "-DArgumentParser_DIR=\(swiftArgumentParserBuildURL.appending(components: "cmake", "modules").path())",
             "-DLLBuild_DIR=\(llbuildBuildURL.appending(components: "cmake", "modules").path())",
@@ -107,11 +115,28 @@ struct CMakeSmokeTest: CommandPlugin {
         print("Built swift-build")
     }
 
-    func findSiblingRepository(_ name: String, swiftBuildURL: URL) throws -> URL {
-        let url = swiftBuildURL.deletingLastPathComponent().appending(component: name)
-        print("\(name): \(url.path())")
-        guard FileManager.default.fileExists(atPath: url.path()) else { throw Errors.missingRepository(url.path()) }
-        return url
+    func findDependency(_ name: String, pluginContext: PluginContext) throws -> URL {
+        var stack: [Package] = pluginContext.package.dependencies.map { $0.package }
+        var visited = Set(stack.map { $0.id })
+        var transitiveDependencies = pluginContext.package.dependencies.map { $0.package }
+        while let current = stack.popLast() {
+            for dependency in current.dependencies {
+                guard visited.insert(dependency.package.id).inserted else {
+                    continue
+                }
+                transitiveDependencies.append(dependency.package)
+                stack.append(dependency.package)
+            }
+        }
+        guard let dependency = transitiveDependencies.first(where: { $0.id == name }) else {
+            throw Errors.missingRepository(name)
+        }
+        let dependencyURL = dependency.directoryURL
+        print("\(name): \(dependencyURL.path())")
+        guard FileManager.default.fileExists(atPath: dependencyURL.path()) else {
+            throw Errors.missingRepository(dependencyURL.path())
+        }
+        return dependencyURL
     }
 }
 

Sources/SWBAndroidPlatform/CMakeLists.txt

@@ -28,7 +28,7 @@ file(CONFIGURE
   ]]
   ESCAPE_QUOTES @ONLY NEWLINE_STYLE LF)
 
-add_library(SWBAndroidPlatform STATIC
+add_library(SWBAndroidPlatform
   AndroidSDK.swift
   Plugin.swift)
 target_link_libraries(SWBAndroidPlatform PUBLIC
@@ -37,3 +37,11 @@ target_link_libraries(SWBAndroidPlatform PUBLIC
   SWBUtil)
 target_sources(SWBAndroidPlatform PRIVATE
   "${CMAKE_CURRENT_BINARY_DIR}/resource_bundle_accessor.swift")
+
+set_target_properties(SWBAndroidPlatform PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
+
+set_property(GLOBAL APPEND PROPERTY SWIFTBUILD_EXPORTS SWBAndroidPlatform)
+
+install(TARGETS SWBAndroidPlatform
+    ARCHIVE DESTINATION "${SwiftBuild_INSTALL_LIBDIR}")