Merge pull request #25 from milseman/dyadically_distributed

Ease binary distribution

Author: milseman

Package.swift

@@ -15,21 +15,20 @@ import PackageDescription
 let targets: [PackageDescription.Target] = [
   .target(
     name: "SystemPackage",
-    dependencies: ["SystemInternals"],
-    path: "Sources/System"),
-  .target(
-    name: "SystemInternals",
     dependencies: ["CSystem"],
+    path: "Sources/System",
     swiftSettings: [
       .define("ENABLE_MOCKING", .when(configuration: .debug))
     ]),
   .target(
     name: "CSystem",
     dependencies: []),
-
   .testTarget(
     name: "SystemTests",
-    dependencies: ["SystemPackage"]),
+    dependencies: ["SystemPackage"],
+    swiftSettings: [
+      .define("SYSTEM_PACKAGE")
+    ]),
 ]
 
 let package = Package(

Sources/System/Errno.swift

@@ -1472,7 +1472,6 @@ extension Errno {
 #endif
 }
 
-@_implementationOnly import SystemInternals
 // @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension Errno {
   // TODO: We want to provide safe access to `errno`, but we need a

Sources/System/FileOperations.swift

@@ -7,8 +7,6 @@
  See https://swift.org/LICENSE.txt for license information
 */
 
-@_implementationOnly import SystemInternals
-
 // @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension FileDescriptor {
   /// Opens or creates a file for reading or writing.
@@ -122,7 +120,7 @@ extension FileDescriptor {
   internal func _seek(
     offset: Int64, from whence: FileDescriptor.SeekOrigin
   ) -> Result<Int64, Errno> {
-    let newOffset = system_lseek(self.rawValue, COffT(offset), whence.rawValue)
+    let newOffset = system_lseek(self.rawValue, _COffT(offset), whence.rawValue)
     return valueOrErrno(Int64(newOffset))
   }
 
@@ -210,7 +208,7 @@ extension FileDescriptor {
     retryOnInterrupt: Bool
   ) -> Result<Int, Errno> {
     valueOrErrno(retryOnInterrupt: retryOnInterrupt) {
-      system_pread(self.rawValue, buffer.baseAddress, buffer.count, COffT(offset))
+      system_pread(self.rawValue, buffer.baseAddress, buffer.count, _COffT(offset))
     }
   }
 
@@ -292,7 +290,7 @@ extension FileDescriptor {
     retryOnInterrupt: Bool
   ) -> Result<Int, Errno> {
     valueOrErrno(retryOnInterrupt: retryOnInterrupt) {
-      system_pwrite(self.rawValue, buffer.baseAddress, buffer.count, COffT(offset))
+      system_pwrite(self.rawValue, buffer.baseAddress, buffer.count, _COffT(offset))
     }
   }
 

Sources/System/FilePath/FilePathComponentView.swift

@@ -9,6 +9,7 @@
 
 // MARK: - API
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath {
   /// A bidirectional, range replaceable collection of the non-root components
   /// that make up a file path.
@@ -97,6 +98,7 @@ extension FilePath.ComponentView: BidirectionalCollection {
   }
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath.ComponentView: RangeReplaceableCollection {
   public init() {
     self.init(FilePath())

Sources/System/FilePath/FilePathComponents.swift

@@ -73,6 +73,7 @@ extension FilePath {
   }
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath.Component {
 
   /// Whether a component is a regular file or directory name, or a special
@@ -253,7 +254,6 @@ extension FilePath.Root {
 
 // MARK: - Invariants
 
-// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath.Component {
   // TODO: ensure this all gets easily optimized away in release...
   internal func _invariantCheck() {

Sources/System/FilePath/FilePathParsing.swift

@@ -111,7 +111,6 @@ extension SystemString {
   }
 }
 
-// @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension FilePath {
   internal mutating func _removeTrailingSeparator() {
     _storage._removeTrailingSeparator()
@@ -323,7 +322,6 @@ extension FilePath {
 }
 
 // Whether we are providing Windows paths
-@_implementationOnly import var SystemInternals.forceWindowsPaths
 @inline(__always)
 internal var _windowsPaths: Bool {
   #if os(Windows)

Sources/System/FilePath/FilePathString.swift

@@ -9,7 +9,7 @@
 
 // MARK: - Platform string
 
-// @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath {
   /// Creates a file path by copying bytes from a null-terminated platform
   /// string.
@@ -39,6 +39,7 @@ extension FilePath {
   }
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath.Component {
   /// Creates a file path component by copying bytes from a null-terminated
   /// platform string.
@@ -75,6 +76,7 @@ extension FilePath.Component {
   }
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath.Root {
   /// Creates a file path root by copying bytes from a null-terminated platform
   /// string.
@@ -234,6 +236,7 @@ extension FilePath.Root: CustomStringConvertible, CustomDebugStringConvertible {
 // MARK: - Convenience helpers
 
 // Convenience helpers
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath {
   /// Creates a string by interpreting the path’s content as UTF-8 on Unix
   /// and UTF-16 on Windows.
@@ -244,6 +247,7 @@ extension FilePath {
   }
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath.Component {
   /// Creates a string by interpreting the component’s content as UTF-8 on Unix
   /// and UTF-16 on Windows.
@@ -254,6 +258,7 @@ extension FilePath.Component {
   }
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath.Root {
   /// On Unix, this returns `"/"`.
   ///
@@ -380,6 +385,7 @@ extension String {
 
 // MARK: - Deprecations
 
+// @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension String {
   @available(*, deprecated, renamed: "init(decoding:)")
   public init(_ path: FilePath) { self.init(decoding: path) }
@@ -388,6 +394,7 @@ extension String {
   public init?(validatingUTF8 path: FilePath) { self.init(validating: path) }
 }
 
+// @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension FilePath {
   @available(*, deprecated, renamed: "init(platformString:)")
   public init(cString: UnsafePointer<CChar>) {

Sources/System/FilePath/FilePathSyntax.swift

@@ -9,7 +9,7 @@
 
 // MARK: - Query API
 
-// @available(...)
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath {
   /// Returns true if this path uniquely identifies the location of
   /// a file without reference to an additional starting location.
@@ -103,6 +103,7 @@ extension FilePath {
 }
 
 // MARK: - Decompose a path
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath {
   /// Returns the root of a path if there is one, otherwise `nil`.
   ///
@@ -187,6 +188,7 @@ extension FilePath {
   }
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath {
   /// Returns the final component of the path.
   /// Returns `nil` if the path is empty or only contains a root.
@@ -258,6 +260,7 @@ extension FilePath {
   }
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath.Component {
   /// The extension of this file or directory component.
   ///
@@ -290,6 +293,7 @@ extension FilePath.Component {
   }
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath {
 
   /// The extension of the file or directory last component.
@@ -356,6 +360,7 @@ extension FilePath {
 
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath {
   /// Whether the path is in lexical-normal form, that is `.` and `..`
   /// components have been collapsed lexically (i.e. without following
@@ -436,6 +441,7 @@ extension FilePath {
 }
 
 // Modification and concatenation API
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath {
   /// If `prefix` is a prefix of `self`, removes it and returns `true`.
   ///  Otherwise returns `false`.
@@ -605,6 +611,7 @@ extension FilePath {
 }
 
 // MARK - Renamed
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension FilePath {
   @available(*, unavailable, renamed: "removingLastComponent()")
   public var dirname: FilePath { removingLastComponent() }