Merge branch 'main' of https://github.com/apple/swift-tools-support-core into filepath

Author: stevapple

.gitignore

@@ -6,3 +6,4 @@ xcuserdata/
 .swiftpm
 build
 .vscode
+Package.resolved

CMakeLists.txt

@@ -21,6 +21,8 @@ else()
 endif()
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
+set(CMAKE_DISABLE_IN_SOURCE_BUILD YES)
+
 option(BUILD_SHARED_LIBS "Build shared libraries by default" YES)
 
 if(FIND_PM_DEPS)
@@ -31,6 +33,7 @@ find_package(dispatch QUIET)
 find_package(Foundation QUIET)
 find_package(Threads QUIET)
 find_package(SQLite3 REQUIRED)
+find_package(SwiftSystem CONFIG REQUIRED)
 
 add_subdirectory(Sources)
 add_subdirectory(cmake/modules)

Package.swift

@@ -1,21 +1,37 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.4
 
 /*
  This source file is part of the Swift.org open source project
- 
- Copyright (c) 2019 - 2020 Apple Inc. and the Swift project authors
+
+ Copyright (c) 2019 - 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
  */
 
 
 import PackageDescription
+import class Foundation.ProcessInfo
+
+let macOSPlatform: SupportedPlatform
+if let deploymentTarget = ProcessInfo.processInfo.environment["SWIFTTSC_MACOS_DEPLOYMENT_TARGET"] {
+    macOSPlatform = .macOS(deploymentTarget)
+} else {
+    macOSPlatform = .macOS(.v10_10)
+}
+
+let CMakeFiles = ["CMakeLists.txt"]
 
 let package = Package(
     name: "swift-tools-support-core",
+    platforms: [
+        macOSPlatform,
+    ],
     products: [
+        .library(
+            name: "TSCBasic",
+            targets: ["TSCBasic"]),
         .library(
             name: "SwiftToolsSupport",
             type: .dynamic,
@@ -28,44 +44,50 @@ let package = Package(
             name: "TSCTestSupport",
             targets: ["TSCTestSupport"]),
     ],
-    dependencies: [
-        .package(url: "https://github.com/apple/swift-system.git", .upToNextMinor(from: "0.0.1"))
-    ],
     targets: [
-        
+
         // MARK: Tools support core targets
-        
+
         .target(
             /** Shim target to import missing C headers in Darwin and Glibc modulemap. */
             name: "TSCclibc",
-            dependencies: []),
+            dependencies: [],
+            exclude: CMakeFiles),
         .target(
             /** Cross-platform access to bare `libc` functionality. */
             name: "TSCLibc",
-            dependencies: []),
+            dependencies: [],
+            exclude: CMakeFiles),
         .target(
             /** TSCBasic support library */
             name: "TSCBasic",
-            dependencies: ["TSCLibc", "TSCclibc",
-                           .product(name: "SystemPackage", package: "swift-system")]),
+            dependencies: [
+              "TSCLibc",
+              "TSCclibc",
+              .product(name: "SystemPackage", package: "swift-system"),
+            ],
+            exclude: CMakeFiles + ["README.md"],
+            cxxSettings: [.define("_CRT_SECURE_NO_WARNINGS")]),
         .target(
             /** Abstractions for common operations, should migrate to TSCBasic */
             name: "TSCUtility",
-            dependencies: ["TSCBasic", "TSCclibc"]),
-        
+            dependencies: ["TSCBasic", "TSCclibc"],
+            exclude: CMakeFiles),
+
         // MARK: Additional Test Dependencies
-        
+
         .target(
             /** Generic test support library */
             name: "TSCTestSupport",
             dependencies: ["TSCBasic", "TSCUtility"]),
-        
-        
+
+
         // MARK: Tools support core tests
-        
+
         .testTarget(
             name: "TSCBasicTests",
-            dependencies: ["TSCTestSupport", "TSCclibc"]),
+            dependencies: ["TSCTestSupport", "TSCclibc"],
+            exclude: ["processInputs", "Inputs"]),
         .testTarget(
             name: "TSCBasicPerformanceTests",
             dependencies: ["TSCBasic", "TSCTestSupport"]),
@@ -74,16 +96,20 @@ let package = Package(
             dependencies: ["TSCTestSupport"]),
         .testTarget(
             name: "TSCUtilityTests",
-            dependencies: ["TSCUtility", "TSCTestSupport"]),
+            dependencies: ["TSCUtility", "TSCTestSupport"],
+            exclude: ["pkgconfigInputs", "Inputs"]),
     ]
 )
 
-// FIXME: conditionalise these flags since SwiftPM 5.3 and earlier will crash
-// for platforms they don't know about.
-#if os(Windows)
-  if let TSCBasic = package.targets.first(where: { $0.name == "TSCBasic" }) {
-    TSCBasic.cxxSettings = [
-      .define("_CRT_SECURE_NO_WARNINGS", .when(platforms: [.windows])),
+/// When not using local dependencies, the branch to use for llbuild and TSC repositories.
+let relatedDependenciesBranch = "main"
+
+if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
+    package.dependencies += [
+        .package(url: "https://github.com/apple/swift-system.git", .upToNextMinor(from: "1.1.1")),
+    ]
+} else {
+    package.dependencies += [
+        .package(path: "../swift-system"),
     ]
-  }
-#endif
+}

Sources/TSCBasic/ByteString.swift

@@ -14,7 +14,7 @@ import Foundation
 ///
 /// This struct provides useful operations for working with buffers of
 /// bytes. Conceptually it is just a contiguous array of bytes (UInt8), but it
-/// contains methods and default behavor suitable for common operations done
+/// contains methods and default behavior suitable for common operations done
 /// using bytes strings.
 ///
 /// This struct *is not* intended to be used for significant mutation of byte

Sources/TSCBasic/CMakeLists.txt

@@ -50,15 +50,15 @@ add_library(TSCBasic
   Thread.swift
   Tuple.swift
   misc.swift)
-  
+
 target_compile_options(TSCBasic PUBLIC
   # Don't use GNU strerror_r on Android.
   "$<$<PLATFORM_ID:Android>:SHELL:-Xcc -U_GNU_SOURCE>"
   # Ignore secure function warnings on Windows.
   "$<$<PLATFORM_ID:Windows>:SHELL:-Xcc -D_CRT_SECURE_NO_WARNINGS>")
 target_link_libraries(TSCBasic PUBLIC
-  TSCLibc
-  SwiftSystem)
+  SwiftSystem::SystemPackage
+  TSCLibc)
 target_link_libraries(TSCBasic PRIVATE
   TSCclibc)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)