Fix target creation

This commit is contained in:
Pavel Punegov
2018-04-27 18:37:51 +03:00
committed by Pavel Punegov
parent 765654f7c2
commit c10a437ef7
3 changed files with 5 additions and 7 deletions
+2 -1
View File
@@ -16,6 +16,7 @@
import groovy.json.JsonOutput import groovy.json.JsonOutput
import org.jetbrains.kotlin.* import org.jetbrains.kotlin.*
import org.jetbrains.kotlin.konan.target.KonanTarget
buildscript { buildscript {
repositories { repositories {
@@ -2612,7 +2613,7 @@ if (isMac()) {
args "-lobjc", '-fobjc-arc' args "-lobjc", '-fobjc-arc'
args '-fPIC', '-shared', '-o', "$buildDir/libobjcsmoke.dylib" args '-fPIC', '-shared', '-o', "$buildDir/libobjcsmoke.dylib"
} }
if (project.testTarget == 'ios_x64') { if (project.target instanceof KonanTarget.IOS_X64) {
UtilsKt.codesign(project, "$buildDir/libobjcsmoke.dylib") UtilsKt.codesign(project, "$buildDir/libobjcsmoke.dylib")
} }
} }
@@ -1,13 +1,10 @@
package org.jetbrains.kotlin package org.jetbrains.kotlin
import org.gradle.api.Action
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.Project
import org.gradle.api.tasks.Input import org.gradle.api.tasks.Input
import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.SourceSetContainer import org.gradle.api.tasks.SourceSetContainer
import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskAction
import org.gradle.process.ExecSpec
import org.jetbrains.kotlin.konan.target.* import org.jetbrains.kotlin.konan.target.*
@@ -2,11 +2,11 @@ package org.jetbrains.kotlin
import org.gradle.api.Project import org.gradle.api.Project
import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.target.PlatformManager import org.jetbrains.kotlin.konan.target.PlatformManager
fun Project.platformManager() = rootProject.findProperty("platformManager") as PlatformManager fun Project.platformManager() = findProperty("platformManager") as PlatformManager
fun Project.testTarget() = findProperty("target") as KonanTarget
fun Project.testTarget() = platformManager().targetManager(project.findProperty("testTarget") as String?).target
/** /**
* Ad-hoc signing of the specified path * Ad-hoc signing of the specified path