Merge pull request #81281 from hamishknight/you-get-a-buildable-folder

Author: hamishknight

utils/swift-xcodegen/Package.resolved

@@ -8,13 +8,14 @@ let package = Package(
     name: "swift-xcodegen",
     platforms: [.macOS(.v13)],
     targets: [
-        .target(name: "Xcodeproj", exclude: ["README.md"]),
         .target(
             name: "SwiftXcodeGen",
             dependencies: [
               .product(name: "ArgumentParser", package: "swift-argument-parser"),
               .product(name: "SwiftOptions", package: "swift-driver"),
-              "Xcodeproj"
+            ],
+            exclude: [
+              "Xcodeproj/README.md",
             ],
             swiftSettings: [
               .enableExperimentalFeature("StrictConcurrency")

utils/swift-xcodegen/Package.swift

@@ -94,11 +94,7 @@ PROJECT CONFIGURATION:
                           Requires Xcode 16: Enables the use of "buildable folders", allowing
                           folder references to be used for compatible targets. This allows new
                           source files to be added to a target without needing to regenerate the
-                          project.
-
-                          Only supported for targets that have no per-file build settings. This
-                          unfortunately means some Clang targes such as 'lib/Basic' and 'stdlib'
-                          cannot currently use buildable folders. (default: --buildable-folders)
+                          project. (default: --buildable-folders)
 
   --runtimes-build-dir <runtimes-build-dir>
                           Experimental: The path to a build directory for the new 'Runtimes/'

utils/swift-xcodegen/README.md

@@ -147,12 +147,22 @@ extension Command.Flag {
     swiftc(.experimentalSkipNonInlinableFunctionBodies)
   static let experimentalSkipNonInlinableFunctionBodiesWithoutTypes = 
     swiftc(.experimentalSkipNonInlinableFunctionBodiesWithoutTypes)
+  static let enableUpcomingFeature =
+    swiftc(.enableUpcomingFeature)
+  static let disableExperimentalFeature =
+    swiftc(.disableExperimentalFeature)
+  static let disableUpcomingFeature =
+    swiftc(.disableUpcomingFeature)
   static let F =
     swiftc(.F)
   static let Fsystem =
     swiftc(.Fsystem)
+  static let libraryLevel =
+    swiftc(.libraryLevel)
   static let moduleName =
     swiftc(.moduleName)
+  static let moduleAbiName =
+    swiftc(.moduleAbiName)
   static let moduleLinkName =
     swiftc(.moduleLinkName)
   static let nostdimport =
@@ -171,8 +181,12 @@ extension Command.Flag {
     swiftc(.runtimeCompatibilityVersion)
   static let sdk =
     swiftc(.sdk)
+  static let strictMemorySafety =
+    swiftc(.strictMemorySafety)
   static let swiftVersion =
     swiftc(.swiftVersion)
+  static let warnImplicitOverrides =
+    swiftc(.warnImplicitOverrides)
   static let wholeModuleOptimization =
     swiftc(.wholeModuleOptimization)
   static let wmo =
@@ -236,21 +250,28 @@ extension KnownCommand {
     .experimentalSkipAllFunctionBodies,
     .experimentalSkipNonInlinableFunctionBodies,
     .experimentalSkipNonInlinableFunctionBodiesWithoutTypes,
+    .enableUpcomingFeature,
+    .disableExperimentalFeature,
+    .disableUpcomingFeature,
     .F,
     .Fsystem,
     .I,
     .nostdimport,
     .O,
     .Onone,
+    .libraryLevel,
     .moduleName,
+    .moduleAbiName,
     .moduleLinkName,
     .packageName,
     .parseAsLibrary,
     .parseStdlib,
     .runtimeCompatibilityVersion,
     .target,
     .sdk,
+    .strictMemorySafety,
     .swiftVersion,
+    .warnImplicitOverrides,
     .wholeModuleOptimization,
     .wmo,
     .Xcc,

utils/swift-xcodegen/Sources/SwiftXcodeGen/Command/KnownCommand.swift

@@ -31,8 +31,8 @@ struct ClangTarget {
 }
 
 extension RepoBuildDir {
-  func getCSourceFilePaths(for path: RelativePath) throws -> [RelativePath] {
-    try getAllRepoSubpaths(of: path).filter(\.isCSourceLike)
+  func getClangSourceFilePaths(for path: RelativePath) throws -> [RelativePath] {
+    try getAllRepoSubpaths(of: path).filter(\.isClangSource)
   }
 
   func getHeaderFilePaths(for path: RelativePath) throws -> [RelativePath] {
@@ -45,7 +45,7 @@ extension RepoBuildDir {
     let path = target.path
     let name = target.name
 
-    let sourcePaths = try getCSourceFilePaths(for: path)
+    let sourcePaths = try getClangSourceFilePaths(for: path)
     let headers = try getHeaderFilePaths(for: path)
     if sourcePaths.isEmpty && headers.isEmpty {
       return nil