Merge remote-tracking branch 'upstream/main' into windows-executable

Author: stevapple

.gitignore

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

CMakeLists.txt

@@ -21,12 +21,15 @@ 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)
 
 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

@@ -2,10 +2,10 @@
 
 /*
  This source file is part of the Swift.org open source project
- 
+
  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
  */
@@ -21,7 +21,7 @@ if let deploymentTarget = ProcessInfo.processInfo.environment["SWIFTTSC_MACOS_DE
     macOSPlatform = .macOS(.v10_10)
 }
 
-let CMakeFiles = ["cmake_install.cmake", "CMakeLists.txt", "CMakeFiles"]
+let CMakeFiles = ["CMakeLists.txt"]
 
 let package = Package(
     name: "swift-tools-support-core",
@@ -46,9 +46,9 @@ let package = Package(
     ],
     dependencies: [],
     targets: [
-        
+
         // MARK: Tools support core targets
-        
+
         .target(
             /** Shim target to import missing C headers in Darwin and Glibc modulemap. */
             name: "TSCclibc",
@@ -62,24 +62,28 @@ let package = Package(
         .target(
             /** TSCBasic support library */
             name: "TSCBasic",
-            dependencies: ["TSCLibc", "TSCclibc"],
+            dependencies: [
+              "TSCLibc",
+              "TSCclibc",
+              .product(name: "SystemPackage", package: "swift-system"),
+            ],
             exclude: CMakeFiles + ["README.md"]),
         .target(
             /** Abstractions for common operations, should migrate to TSCBasic */
             name: "TSCUtility",
             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"],
@@ -97,6 +101,19 @@ let package = Package(
     ]
 )
 
+/// 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"),
+     ]
+ }
+
 // FIXME: conditionalise these flags since SwiftPM 5.3 and earlier will crash
 // for platforms they don't know about.
 #if os(Windows)

Sources/TSCBasic/CMakeLists.txt

@@ -50,13 +50,14 @@ 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
+  SwiftSystem::SystemPackage
   TSCLibc)
 target_link_libraries(TSCBasic PRIVATE
    TSCclibc)