Merge pull request #1 from korlibs/soywiz/fix.knative

Try to fix K/N compilation for new FFI
korlibs · Jul 30, 2024 · b3e5080 · b3e5080
2 parents de64f48 + 620df87
commit b3e5080
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 6 deletions.
diff --git a/korlibs-ffi-ksp/src@jvm/korlibs/ffi/ksp/FFIBuilderProcessor.kt b/korlibs-ffi-ksp/src@jvm/korlibs/ffi/ksp/FFIBuilderProcessor.kt
@@ -23,9 +23,12 @@ private class FFIBuilderProcessor(val environment: SymbolProcessorEnvironment) :
     override fun process(resolver: Resolver): List<KSAnnotated> {
         val isCommon = environment.platforms.size >= 2
         val mainPlatform = if (isCommon) MetadataPlatformInfo else environment.platforms.first()
-        val isJvm = if (!isCommon && mainPlatform is JvmPlatformInfo) true else false
-        val isNative = if (!isCommon && mainPlatform is NativePlatformInfo) true else false
-        val isJs = if (!isCommon && mainPlatform is JsPlatformInfo) true else false
+        val isAndroid = resolver.getClassDeclarationByName(resolver.getKSNameFromString("android.view.View")) != null
+        val isJvm = !isCommon && mainPlatform is JvmPlatformInfo && !isAndroid
+        val isNative = !isCommon && mainPlatform is NativePlatformInfo
+        val isJs = !isCommon && mainPlatform is JsPlatformInfo
+
+        //logger.error("NATIVE: ${environment.options}, ${environment.platforms.map { it.platformName }}, isAndroidProject=$isAndroidProject")
 
         val casts = when {
             isJvm -> jnaCasts
@@ -86,6 +89,7 @@ private class FFIBuilderProcessor(val environment: SymbolProcessorEnvironment) :
 
                         val ffiAnnotation = sym.annotations.firstOrNull { it.shortName.getShortName() == "FFI" } ?: error("ERROR: FFI annotation not found")
                         val libs = ffiAnnotation.arguments.associate { it.sname to it.value.toString().takeIf { it.isNotBlank() } }
+                        val libraryCommonLib = libs["commonLib"] ?: "libc"
                         val libraryNameWin = libs["windowsLib"] ?: libs["commonLib"] ?: "msvcrt"
                         val libraryNameMac = libs["macosLib"] ?: libs["commonLib"] ?: "/usr/lib/libSystem.dylib"
                         val libraryNameLinux = libs["linuxLib"] ?: libs["commonLib"] ?: "libc"
@@ -122,10 +126,10 @@ private class FFIBuilderProcessor(val environment: SymbolProcessorEnvironment) :
                                 it.appendLine("fun FFIPointer.toPointer(): COpaquePointer? = address.toCPointer()")
 
                                 it.appendLine("private object __$classNameImpl {")
-                                it.appendLine("  val __LIB__ = platform.windows.LoadLibraryW(\"$libraryNameWin\")")
+                                it.appendLine("  val __LIB__ = korlibs.ffi.api.FFIDLOpenPlatform(common = \"$libraryCommonLib\", linux = \"$libraryNameLinux\", macos = \"$libraryNameMac\", windows = \"$libraryNameWin\")")
 
                                 for (func in sym.getDeclaredFunctions()) {
-                                    it.appendLine("  val ${func.sname} by lazy { val funcName = \"${func.sname}\"; platform.windows.GetProcAddress(__LIB__, funcName)?.reinterpret<CFunction<(${func.parameters.asTypeString(casts)}) -> ${func.returnType.asString(casts)}>>() ?: error(\"Can't find ${'$'}funcName\") }")
+                                    it.appendLine("  val ${func.sname} by lazy { val funcName = \"${func.sname}\"; korlibs.ffi.api.FFIDLSym(__LIB__, funcName)?.reinterpret<CFunction<(${func.parameters.asTypeString(casts)}) -> ${func.returnType.asString(casts)}>>() ?: error(\"Can't find ${'$'}funcName\") }")
                                 }
                                 it.appendLine("}")
                             }

diff --git a/korlibs-ffi/build.gradle.kts b/korlibs-ffi/build.gradle.kts
@@ -14,6 +14,7 @@ tasks.withType(KspTask::class) {
         this.dependsOn("kspCommonMainKotlinMetadata")
     }
 }
+tasks.getByName("sourcesJar").dependsOn("kspCommonMainKotlinMetadata")
 //tasks.all {
 //    if (this.name.contains("ksp")) {
 //        println("task=$this :: ${this::class}")

diff --git a/korlibs-ffi/module.yaml.bak → korlibs-ffi/module.yaml b/korlibs-ffi/module.yaml.bak → korlibs-ffi/module.yaml
diff --git a/korlibs-ffi/src/korlibs/ffi/api/TestMathFFI.kt b/korlibs-ffi/src/korlibs/ffi/api/TestMathFFI.kt
@@ -1,6 +1,6 @@
 package korlibs.ffi.api
 
-@FFI(commonLib = "libc.so.6", macosLib = "/usr/lib/libSystem.dylib", windowsLib = "msvcrt")
+@FFI(commonLib = "libm.so.6", macosLib = "/usr/lib/libSystem.dylib", windowsLib = "msvcrt")
 internal interface TestMathFFI : AutoCloseable {
     fun cosf(v: Float): Float
     fun malloc(size: Int): FFIPointer

diff --git a/korlibs-ffi/src@mingw/korlibs/ffi/api/FFI.mingw.kt b/korlibs-ffi/src@mingw/korlibs/ffi/api/FFI.mingw.kt
@@ -0,0 +1,10 @@
+@file:OptIn(ExperimentalForeignApi::class)
+
+package korlibs.ffi.api
+
+import kotlinx.cinterop.*
+import platform.windows.*
+
+actual fun FFIDLOpen(name: String): COpaquePointer? = LoadLibraryW(name)?.reinterpret()
+actual fun FFIDLClose(lib: COpaquePointer?): Unit { FreeLibrary(lib?.reinterpret()) }
+actual fun FFIDLSym(lib: COpaquePointer?, name: String): COpaquePointer? = GetProcAddress(lib?.reinterpret(), name)?.reinterpret()
diff --git a/korlibs-ffi/src@native/korlibs/ffi/api/FFI.native.kt b/korlibs-ffi/src@native/korlibs/ffi/api/FFI.native.kt
@@ -1,3 +1,24 @@
+@file:OptIn(ExperimentalForeignApi::class)
+
 package korlibs.ffi.api
 
+import kotlinx.cinterop.*
+import kotlin.experimental.*
+
 actual val isSupportedFFI: Boolean = true
+
+expect fun FFIDLOpen(name: String): COpaquePointer?
+expect fun FFIDLClose(lib: COpaquePointer?): Unit
+expect fun FFIDLSym(lib: COpaquePointer?, name: String): COpaquePointer?
+@OptIn(ExperimentalNativeApi::class)
+fun FFIDLOpenPlatform(
+    common: String? = null,
+    linux: String? = null,
+    macos: String? = null,
+    windows: String? = null,
+): COpaquePointer? = FFIDLOpen(when (Platform.osFamily) {
+    OsFamily.MACOSX, OsFamily.IOS, OsFamily.TVOS, OsFamily.WATCHOS -> macos ?: common
+    OsFamily.LINUX -> linux ?: common
+    OsFamily.WINDOWS -> windows ?: common
+    OsFamily.WASM, OsFamily.UNKNOWN, OsFamily.ANDROID -> common
+} ?: error("Can't find library name"))
diff --git a/korlibs-ffi/src@posix/korlibs/ffi/api/FFI.posix.kt b/korlibs-ffi/src@posix/korlibs/ffi/api/FFI.posix.kt
@@ -0,0 +1,10 @@
+@file:OptIn(ExperimentalForeignApi::class)
+
+package korlibs.ffi.api
+
+import kotlinx.cinterop.*
+import platform.posix.*
+
+actual fun FFIDLOpen(name: String): COpaquePointer? = platform.posix.dlopen(name, platform.posix.RTLD_LAZY or 1)
+actual fun FFIDLClose(lib: COpaquePointer?): Unit { platform.posix.dlclose(lib) }
+actual fun FFIDLSym(lib: COpaquePointer?, name: String): COpaquePointer? = platform.posix.dlsym(lib, name)