Merge pull request #320 from compnerd/dot

SKCore: make `.` part of the extension

Author: benlangmuir

Sources/SKCore/Toolchain.swift

@@ -145,21 +145,21 @@ extension Toolchain {
     }
 
     // If 'currentPlatform' is nil it's most likely an unknown linux flavor.
-    let dylibExt = Platform.currentPlatform?.dynamicLibraryExtension ?? "so"
+    let dylibExt = Platform.currentPlatform?.dynamicLibraryExtension ?? ".so"
 
     let sourcekitdPath = libPath.appending(components: "sourcekitd.framework", "sourcekitd")
     if fs.isFile(sourcekitdPath) {
       self.sourcekitd = sourcekitdPath
       foundAny = true
     } else {
-      let sourcekitdPath = libPath.appending(component: "libsourcekitdInProc.\(dylibExt)")
+      let sourcekitdPath = libPath.appending(component: "libsourcekitdInProc\(dylibExt)")
       if fs.isFile(sourcekitdPath) {
         self.sourcekitd = sourcekitdPath
         foundAny = true
       }
     }
 
-    let libIndexStore = libPath.appending(components: "libIndexStore.\(dylibExt)")
+    let libIndexStore = libPath.appending(components: "libIndexStore\(dylibExt)")
     if fs.isFile(libIndexStore) {
       self.libIndexStore = libIndexStore
       foundAny = true

Sources/SKSupport/Platform.swift

@@ -17,8 +17,8 @@ extension Platform {
   /// The file extension used for a dynamic library on this platform.
   public var dynamicLibraryExtension: String {
     switch self {
-    case .darwin: return "dylib"
-    case .linux, .android: return "so"
+    case .darwin: return ".dylib"
+    case .linux, .android: return ".so"
     }
   }
 }

Tests/SKCoreTests/ToolchainRegistryTests.swift

@@ -526,16 +526,16 @@ private func makeToolchain(
     makeExec(binPath.appending(component: "swiftc"))
   }
 
-  let dylibExt = Platform.currentPlatform?.dynamicLibraryExtension ?? "so"
+  let dylibExt = Platform.currentPlatform?.dynamicLibraryExtension ?? ".so"
 
   if sourcekitd {
     try! fs.createDirectory(libPath.appending(component: "sourcekitd.framework"))
     try! fs.writeFileContents(libPath.appending(components: "sourcekitd.framework", "sourcekitd") , bytes: "")
   }
   if sourcekitdInProc {
-    try! fs.writeFileContents(libPath.appending(component: "libsourcekitdInProc.\(dylibExt)") , bytes: "")
+    try! fs.writeFileContents(libPath.appending(component: "libsourcekitdInProc\(dylibExt)") , bytes: "")
   }
   if libIndexStore {
-    try! fs.writeFileContents(libPath.appending(component: "libIndexStore.\(dylibExt)") , bytes: "")
+    try! fs.writeFileContents(libPath.appending(component: "libIndexStore\(dylibExt)") , bytes: "")
   }
 }