Fix precondition failures with relative paths on the command line.

This is fallout from the AbsolutePath adoption changes.

Author: abertelrud

Sources/Commands/Options.swift

@@ -26,7 +26,7 @@ public class Options {
             set { _build = newValue.asString }
         }
 
-        private var _build = getenv("SWIFT_BUILD_PATH")
+        private var _build = getenv("SWIFT_BUILD_PATH")?.abspath
     }
 
     public init()

Sources/Commands/SwiftBuildTool.swift

@@ -81,7 +81,7 @@ private enum BuildToolFlag: Argument {
 
         switch argument {
         case Flag.chdir, Flag.C:
-            self = try .chdir(AbsolutePath(forcePop()))
+            self = try .chdir(AbsolutePath(forcePop().abspath))
         case "--verbose", "-v":
             self = .verbose(1)
         case "-Xcc":
@@ -91,7 +91,7 @@ private enum BuildToolFlag: Argument {
         case "-Xswiftc":
             self = try .xswiftc(forcePop())
         case "--build-path":
-            self = try .buildPath(AbsolutePath(forcePop()))
+            self = try .buildPath(AbsolutePath(forcePop().abspath))
         case "--build-tests":
             self = .buildTests
         case "--color":
@@ -103,7 +103,7 @@ private enum BuildToolFlag: Argument {
         case "--ignore-dependencies":
             self = .ignoreDependencies
         case "--xcconfig-overrides":
-            self = try .xcconfigOverrides(AbsolutePath(forcePop()))
+            self = try .xcconfigOverrides(AbsolutePath(forcePop().abspath))
         default:
             return nil
         }
@@ -173,10 +173,10 @@ public struct SwiftBuildTool: SwiftTool {
                 fallthrough
 
             case .clean(.build):
-                let artifacts = ["debug", "release"].map{ AbsolutePath(opts.path.build, $0) }.map{ ($0, "\($0).yaml") }
+                let artifacts = ["debug", "release"].map{ AbsolutePath(opts.path.build, $0) }.map{ ($0, AbsolutePath("\($0.asString).yaml")) }
                 for (dir, yml) in artifacts {
                     if dir.asString.isDirectory { try Utility.removeFileTree(dir.asString) }
-                    if yml.abspath.isFile { try Utility.removeFileTree(yml) }
+                    if yml.asString.isFile { try Utility.removeFileTree(yml.asString) }
                 }
 
                 let db = opts.path.build.appending("build.db")

Sources/Commands/SwiftPackageTool.swift

@@ -103,15 +103,15 @@ private enum PackageToolFlag: Argument {
 
         switch argument {
         case Flag.chdir, Flag.C:
-            self = try .chdir(AbsolutePath(forcePop()))
+            self = try .chdir(AbsolutePath(forcePop().abspath))
         case "--type":
             self = try .initMode(forcePop())
         case "--format":
             self = try .showDepsMode(forcePop())
         case "--output":
-            self = try .outputPath(AbsolutePath(forcePop()))
+            self = try .outputPath(AbsolutePath(forcePop().abspath))
         case "--input":
-            self = try .inputPath(AbsolutePath(forcePop()))
+            self = try .inputPath(AbsolutePath(forcePop().abspath))
         case "--verbose", "-v":
             self = .verbose(1)
         case "--color":
@@ -129,7 +129,7 @@ private enum PackageToolFlag: Argument {
         case "-Xswiftc":
             self = try .xswiftc(forcePop())
         case "--xcconfig-overrides":
-            self = try .xcconfigOverrides(AbsolutePath(forcePop()))
+            self = try .xcconfigOverrides(AbsolutePath(forcePop().abspath))
         default:
             return nil
         }

Sources/Commands/SwiftTestTool.swift

@@ -76,7 +76,7 @@ private enum TestToolFlag: Argument {
         switch argument {
         case "--chdir", "-C":
             guard let path = pop() else { throw OptionParserError.expectedAssociatedValue(argument) }
-            self = .chdir(AbsolutePath(path))
+            self = .chdir(AbsolutePath(path.abspath))
         case "--skip-build":
             self = .skipBuild
         case "--build-path":
@@ -172,7 +172,7 @@ public struct SwiftTestTool: SwiftTool {
                 throw TestError.testsExecutableNotFound
             }
 
-            return AbsolutePath(path)
+            return AbsolutePath(path.abspath)
         }
     }
 

Sources/Commands/ToolDefaults.swift

@@ -20,10 +20,10 @@ struct ToolDefaults {
     // FIXME: This isn't correct; we need to handle a missing SWIFT_EXEC.
     static let SWIFT_EXEC = AbsolutePath(getenv("SWIFT_EXEC")!.abspath)
     static let llbuild = AbsolutePath(getenv("SWIFT_EXEC")!.abspath).appending("../swift-build-tool")
-    static let libdir = AbsolutePath(argv0).parentDirectory
+    static let libdir = AbsolutePath(argv0.abspath).parentDirectory
   #else
-    static let SWIFT_EXEC = AbsolutePath(argv0).appending("../swiftc")
-    static let llbuild = AbsolutePath(argv0).appending("../swift-build-tool")
-    static let libdir = AbsolutePath(argv0).appending("../../lib/swift/pm")
+    static let SWIFT_EXEC = AbsolutePath(argv0.abspath).appending("../swiftc")
+    static let llbuild = AbsolutePath(argv0.abspath).appending("../swift-build-tool")
+    static let libdir = AbsolutePath(argv0.abspath).appending("../../lib/swift/pm")
   #endif
 }