azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Perform codesign in tests for all simulators

Browse Source
This commit is contained in:
Sergey Bogolepov
2021-04-05 16:47:40 +07:00
committed by TeamCityServer
parent 7b06249e7f
commit 316d62a72f
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/tests/build.gradle
+8 -8
View File
@@ -4221,7 +4221,7 @@ if (PlatformInfo.isAppleTarget(project)) {
// Enable ARC optimizations to prevent some objects from leaking in Obj-C code due to exceptions: // Enable ARC optimizations to prevent some objects from leaking in Obj-C code due to exceptions:
args '-O2' args '-O2'
} }
if (project.target instanceof KonanTarget.IOS_X64) { if (UtilsKt.isSimulatorTarget(project, project.target)) {
UtilsKt.codesign(project, "$buildDir/libobjcsmoke.dylib") UtilsKt.codesign(project, "$buildDir/libobjcsmoke.dylib")
} }
@@ -4247,7 +4247,7 @@ if (PlatformInfo.isAppleTarget(project)) {
// Enable ARC optimizations to prevent some objects from leaking in Obj-C code due to exceptions: // Enable ARC optimizations to prevent some objects from leaking in Obj-C code due to exceptions:
args '-O2' args '-O2'
} }
if (project.target instanceof KonanTarget.IOS_X64) { if (UtilsKt.isSimulatorTarget(project, project.target)) {
UtilsKt.codesign(project, "$buildDir/libobjctests.dylib") UtilsKt.codesign(project, "$buildDir/libobjctests.dylib")
} }
} }
@@ -4265,7 +4265,7 @@ if (PlatformInfo.isAppleTarget(project)) {
args "-lobjc", '-fobjc-arc' args "-lobjc", '-fobjc-arc'
args '-fPIC', '-shared', '-o', "$buildDir/libobjcmisc.dylib" args '-fPIC', '-shared', '-o', "$buildDir/libobjcmisc.dylib"
} }
if (project.target instanceof KonanTarget.IOS_X64) { if (UtilsKt.isSimulatorTarget(project, project.target)) {
UtilsKt.codesign(project, "$buildDir/libobjcmisc.dylib") UtilsKt.codesign(project, "$buildDir/libobjcmisc.dylib")
} }
} }
@@ -4282,7 +4282,7 @@ if (PlatformInfo.isAppleTarget(project)) {
args "-lobjc", '-fobjc-arc' args "-lobjc", '-fobjc-arc'
args '-fPIC', '-shared', '-o', "$buildDir/libobjcmessaging.dylib" args '-fPIC', '-shared', '-o', "$buildDir/libobjcmessaging.dylib"
} }
if (project.target instanceof KonanTarget.IOS_X64) { if (UtilsKt.isSimulatorTarget(project, project.target)) {
UtilsKt.codesign(project, "$buildDir/libobjcmessaging.dylib") UtilsKt.codesign(project, "$buildDir/libobjcmessaging.dylib")
} }
} }
@@ -4300,7 +4300,7 @@ if (PlatformInfo.isAppleTarget(project)) {
args "-lobjc", '-fobjc-arc' args "-lobjc", '-fobjc-arc'
args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib" args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib"
} }
if (project.target instanceof KonanTarget.IOS_X64) { if (UtilsKt.isSimulatorTarget(project, project.target)) {
UtilsKt.codesign(project, "$buildDir/libobjcexception.dylib") UtilsKt.codesign(project, "$buildDir/libobjcexception.dylib")
} }
} }
@@ -4319,7 +4319,7 @@ if (PlatformInfo.isAppleTarget(project)) {
args "-lobjc", '-fobjc-arc' args "-lobjc", '-fobjc-arc'
args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib" args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib"
} }
if (project.target instanceof KonanTarget.IOS_X64) { if (UtilsKt.isSimulatorTarget(project, project.target)) {
UtilsKt.codesign(project, "$buildDir/libobjcexception.dylib") UtilsKt.codesign(project, "$buildDir/libobjcexception.dylib")
} }
} }
@@ -4338,7 +4338,7 @@ if (PlatformInfo.isAppleTarget(project)) {
args "-lobjc", '-fobjc-arc' args "-lobjc", '-fobjc-arc'
args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib" args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib"
} }
if (project.target instanceof KonanTarget.IOS_X64) { if (UtilsKt.isSimulatorTarget(project, project.target)) {
UtilsKt.codesign(project, "$buildDir/libobjcexception.dylib") UtilsKt.codesign(project, "$buildDir/libobjcexception.dylib")
} }
} }
@@ -4377,7 +4377,7 @@ if (PlatformInfo.isAppleTarget(project)) {
args "-lobjc", '-fobjc-arc' args "-lobjc", '-fobjc-arc'
args '-fPIC', '-shared', '-o', "$buildDir/libobjc_kt42172.dylib" args '-fPIC', '-shared', '-o', "$buildDir/libobjc_kt42172.dylib"
} }
if (project.target instanceof KonanTarget.IOS_X64) { if (UtilsKt.isSimulatorTarget(project, project.target)) {
UtilsKt.codesign(project, "$buildDir/libobjc_kt42172.dylib") UtilsKt.codesign(project, "$buildDir/libobjc_kt42172.dylib")
} }
} }
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
+6
View File
@@ -158,6 +158,12 @@ fun codesign(project: Project, path: String) {
} }
} }
/**
* Check that [target] is Apple simulator
*/
fun isSimulatorTarget(project: Project, target: KonanTarget): Boolean =
project.platformManager.platform(target).targetTriple.isSimulator
/** /**
* Creates a list of file paths to be compiled from the given [compile] list with regard to [exclude] list. * Creates a list of file paths to be compiled from the given [compile] list with regard to [exclude] list.
*/ */