Merge pull request #24 from minuscorp/dynamic-imports

Allow to link dynamic libraries when importing *Config modules
shibapm · Oct 27, 2021 · 5df1709 · 5df1709
2 parents 84d4d70 + 57b6eeb
commit 5df1709
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/Sources/PackageConfig/DynamicLibraries.swift b/Sources/PackageConfig/DynamicLibraries.swift
@@ -1,6 +1,8 @@
 
 import class Foundation.Process
 import class Foundation.Pipe
+import class Foundation.NSRegularExpression
+import struct Foundation.NSRange
 
 enum DynamicLibraries {
 
@@ -55,4 +57,24 @@ enum DynamicLibraries {
 			.replacingOccurrences(of: "\"\"", with: "\"")
 			.split(separator: "\"").map(String.init)
 	}
+
+    static func listImports() -> [String] {
+        let lines = read()
+
+        var matches: [String] = []
+
+        for line in lines {
+            if let match = line.range(of: "import .*Config", options: .regularExpression) {
+                matches.append(String(line[match]))
+            }
+        }
+
+        debugLog("MATCHES: \(matches)")
+
+        return matches
+            .compactMap { $0.split(separator: " ") }
+            .compactMap { $0.last }
+            .map(String.init)
+            .filter { !$0.contains("PackageDescription") }
+    }
 }
diff --git a/Sources/PackageConfig/Package.swift b/Sources/PackageConfig/Package.swift
@@ -121,8 +121,21 @@ enum Package {
         guard let packageConfigPath = libraryPath(for: packageConfigLib) else {
             throw Error("PackageConfig: Could not find lib\(packageConfigLib) to link against, is it possible you've not built yet?")
         }
+        let dyLibs = try DynamicLibraries.listImports().map { (libraryName: String) -> [String] in
+            guard let path = libraryPath(for: libraryName) else {
+                throw Error("PackageConfig: Could not find lib\(libraryName) to link against, is it possible you've not built yet?")
+            }
+
+            return [
+                "-L", path,
+                "-I", path,
+                "-l\(libraryName)",
+            ]
+        }.reduce([], +)
+
+        debugLog("DYLIBS by IMPORT: \(dyLibs)")
 
-        return try DynamicLibraries.list().map { libraryName in
+        let configLibs = try DynamicLibraries.list().map { libraryName in
             guard let path = libraryPath(for: libraryName) else {
                 throw Error("PackageConfig: Could not find lib\(libraryName) to link against, is it possible you've not built yet?")
             }
@@ -137,6 +150,10 @@ enum Package {
             "-I", packageConfigPath,
             "-l\(packageConfigLib)",
         ], +)
+
+        debugLog("CONFIG LIBS: \(configLibs)")
+
+        return dyLibs + configLibs
     }
 
     private static func getSwiftPMManifestArgs(swiftPath: String) -> [String] {