Merge branch 'main' into watchman

Author: compnerd

Package.swift

@@ -28,6 +28,9 @@ let package = Package(
         .iOS(.v13)
     ],
     products: [
+        .library(
+            name: "TSCBasic",
+            targets: ["TSCBasic"]),
         .library(
             name: "SwiftToolsSupport",
             type: .dynamic,

Sources/TSCBasic/Path.swift

@@ -911,10 +911,42 @@ extension AbsolutePath {
     ///
     /// This method is strictly syntactic and does not access the file system
     /// in any way.
+    @available(*, deprecated, renamed: "isDescendantOfOrEqual(to:)")
     public func contains(_ other: AbsolutePath) -> Bool {
-        return self.components.starts(with: other.components)
+        return isDescendantOfOrEqual(to: other)
     }
 
+    /// Returns true if the path is an ancestor of the given path.
+    ///
+    /// This method is strictly syntactic and does not access the file system
+    /// in any way.
+    public func isAncestor(of descendant: AbsolutePath) -> Bool {
+        return descendant.components.dropLast().starts(with: self.components)
+    }
+
+    /// Returns true if the path is an ancestor of or equal to the given path.
+    ///
+    /// This method is strictly syntactic and does not access the file system
+    /// in any way.
+    public func isAncestorOfOrEqual(to descendant: AbsolutePath) -> Bool {
+        return descendant.components.starts(with: self.components)
+    }
+
+    /// Returns true if the path is a descendant of the given path.
+    ///
+    /// This method is strictly syntactic and does not access the file system
+    /// in any way.
+    public func isDescendant(of ancestor: AbsolutePath) -> Bool {
+        return self.components.dropLast().starts(with: ancestor.components)
+    }
+
+    /// Returns true if the path is a descendant of or equal to the given path.
+    ///
+    /// This method is strictly syntactic and does not access the file system
+    /// in any way.
+    public func isDescendantOfOrEqual(to ancestor: AbsolutePath) -> Bool {
+        return self.components.starts(with: ancestor.components)
+    }
 }
 
 extension PathValidationError: CustomNSError {

Sources/TSCBasic/WritableByteStream.swift

@@ -66,6 +66,12 @@ public extension WritableByteStream {
 // Public alias to the old name to not introduce API compatibility.
 public typealias OutputByteStream = WritableByteStream
 
+#if os(Android)
+public typealias FILEPointer = OpaquePointer
+#else
+public typealias FILEPointer = UnsafeMutablePointer<FILE>
+#endif
+
 extension WritableByteStream {
     /// Write a sequence of bytes to the buffer.
     public func write<S: Sequence>(sequence: S) where S.Iterator.Element == UInt8 {
@@ -670,7 +676,7 @@ public class FileOutputByteStream: _WritableByteStreamBase {
 public final class LocalFileOutputByteStream: FileOutputByteStream {
 
     /// The pointer to the file.
-    let filePointer: UnsafeMutablePointer<FILE>
+    let filePointer: FILEPointer
 
     /// Set to an error value if there were any IO error during writing.
     private var error: FileSystemError?
@@ -682,7 +688,7 @@ public final class LocalFileOutputByteStream: FileOutputByteStream {
     private let path: AbsolutePath?
 
     /// Instantiate using the file pointer.
-    public init(filePointer: UnsafeMutablePointer<FILE>, closeOnDeinit: Bool = true, buffered: Bool = true) throws {
+    public init(filePointer: FILEPointer, closeOnDeinit: Bool = true, buffered: Bool = true) throws {
         self.filePointer = filePointer
         self.closeOnDeinit = closeOnDeinit
         self.path = nil

Sources/TSCUtility/BitstreamReader.swift

@@ -183,7 +183,7 @@ private struct BitstreamReader {
         if case .char6 = element {
           // FIXME: Once the minimum deployment target bumps to macOS 11, use
           // the more ergonomic stdlib API everywhere.
-          if #available(macOS 11.0, *) {
+          if #available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
             payload = try .char6String(String(unsafeUninitializedCapacity: Int(length)) { buffer in
               for i in 0..<Int(length) {
                 buffer[i] = try UInt8(readSingleAbbreviatedRecordOperand(element))

Sources/TSCUtility/FSWatch.swift

@@ -100,7 +100,7 @@ private protocol _FileWatcher {
     func stop()
 }
 
-#if os(OpenBSD)
+#if os(OpenBSD) || os(iOS)
 extension FSWatch._WatcherDelegate: NoOpWatcherDelegate {}
 extension NoOpWatcher: _FileWatcher{}
 #elseif os(Windows)
@@ -118,7 +118,7 @@ extension FSEventStream: _FileWatcher{}
 
 // MARK:- inotify
 
-#if os(OpenBSD)
+#if os(OpenBSD) || os(iOS)
 
 public protocol NoOpWatcherDelegate {
     func pathsDidReceiveEvent(_ paths: [AbsolutePath])
@@ -404,10 +404,10 @@ public final class Inotify {
     private var wds: [Int32: AbsolutePath] = [:]
 
     /// The queue on which we read the events.
-    private let readQueue = DispatchQueue(label: "org.swift.swiftpm.\(Inotify.self).read)")
+    private let readQueue = DispatchQueue(label: "org.swift.swiftpm.\(Inotify.self).read")
 
     /// Callback queue for the delegate.
-    private let callbacksQueue = DispatchQueue(label: "org.swift.swiftpm.\(Inotify.self).callback)")
+    private let callbacksQueue = DispatchQueue(label: "org.swift.swiftpm.\(Inotify.self).callback")
 
     /// Condition for handling event reporting.
     private var reportCondition = Condition()
@@ -796,7 +796,7 @@ public final class FSEventStream {
     private var runLoop: CFRunLoop?
 
     /// Callback queue for the delegate.
-    fileprivate let callbacksQueue = DispatchQueue(label: "org.swift.swiftpm.\(FSEventStream.self).callback)")
+    fileprivate let callbacksQueue = DispatchQueue(label: "org.swift.swiftpm.\(FSEventStream.self).callback")
 
     public init(
         paths: [AbsolutePath],