Try to fix krypto build without cinterop commonization

korlibs-archive · Mar 3, 2022 · 8b80e2e · 8b80e2e
1 parent b54da9c
commit 8b80e2e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -398,17 +398,19 @@ subprojects {
                         }
                     }
 
-                    run {
-                        val nativeInteropMainFolder = file("src/nativeInteropMain/kotlin")
+                    for (baseName in listOf("nativeInteropMain", "posixInteropMain")) {
+                        val nativeInteropMainFolder = file("src/$baseName/kotlin")
                         if (nativeInteropMainFolder.isDirectory) {
                             val currentNativeTarget = currentPlatformNativeTarget(project)
                             // @TODO: Copy instead of use the same source folder
                             for (target in allNativeTargets(project)) {
+                                if (baseName.contains("Posix") && !target.isPosix) continue
+
                                 val sourceSet = this@sourceSets.maybeCreate("${target.name}Main")
                                 val folder = when {
                                     target == currentNativeTarget -> nativeInteropMainFolder
                                     else -> {
-                                        file("build/nativeInteropMainCopy${target.name}").also { outFolder ->
+                                        file("build/${baseName}Copy${target.name}").also { outFolder ->
                                             outFolder.mkdirs()
                                             copy {
                                                 from(nativeInteropMainFolder)
@@ -422,7 +424,6 @@ subprojects {
                         }
                     }
 
-
                     // Copy test resources
                     afterEvaluate {
                         for (targetV in nativeTargets) {

diff --git a/buildSrc/src/main/kotlin/com/soywiz/korlibs/modules/Targets.kt b/buildSrc/src/main/kotlin/com/soywiz/korlibs/modules/Targets.kt
@@ -33,6 +33,7 @@ val KotlinTarget.isTvosX64: Boolean get() = this.name == "tvosX64"
 val KotlinTarget.isTvosArm64: Boolean get() = this.name == "tvosArm64"
 val KotlinTarget.isTvos: Boolean get() = isTvosX64 || isTvosArm64
 val KotlinTarget.isDesktop: Boolean get() = isWin || isLinux || isMacos
+val KotlinTarget.isPosix: Boolean get() = this is KotlinNativeTarget && !this.isWin
 
 val isWindows: Boolean get() = org.apache.tools.ant.taskdefs.condition.Os.isFamily(org.apache.tools.ant.taskdefs.condition.Os.FAMILY_WINDOWS)
 val isMacos: Boolean get() = org.apache.tools.ant.taskdefs.condition.Os.isFamily(org.apache.tools.ant.taskdefs.condition.Os.FAMILY_MAC)

diff --git a/.../soywiz/krypto/SecureRandomNativePosix.kt → .../soywiz/krypto/SecureRandomNativePosix.kt b/.../soywiz/krypto/SecureRandomNativePosix.kt → .../soywiz/krypto/SecureRandomNativePosix.kt