Fix dependencies and docs
This commit is contained in:
committed by
Pavel Punegov
parent
d2f8b3b142
commit
4c9449daf4
@@ -4030,6 +4030,7 @@ Task frameworkTest(String name, Closure<FrameworkTest> configurator) {
|
|||||||
baseDir "$testOutputFramework/${task.name}"
|
baseDir "$testOutputFramework/${task.name}"
|
||||||
|
|
||||||
if (fr.library != null) {
|
if (fr.library != null) {
|
||||||
|
dependsOn konanArtifacts[fr.library].getByTarget(target.name)
|
||||||
libraries {
|
libraries {
|
||||||
file konanArtifacts[fr.library].getArtifactByTarget(target.name)
|
file konanArtifacts[fr.library].getArtifactByTarget(target.name)
|
||||||
}
|
}
|
||||||
@@ -4056,7 +4057,7 @@ Task frameworkTest(String name, Closure<FrameworkTest> configurator) {
|
|||||||
if (isAppleTarget(project)) {
|
if (isAppleTarget(project)) {
|
||||||
frameworkTest('testObjCExport') {
|
frameworkTest('testObjCExport') {
|
||||||
final String frameworkName = 'Kt'
|
final String frameworkName = 'Kt'
|
||||||
final String dir = "$testOutputFramework/$name"
|
final String dir = "$testOutputFramework/testObjCExport"
|
||||||
final File lazyHeader = file("$dir/$target-lazy.h")
|
final File lazyHeader = file("$dir/$target-lazy.h")
|
||||||
|
|
||||||
doLast {
|
doLast {
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Framework description.
|
* Framework description.
|
||||||
|
*
|
||||||
* @param name is the framework name,
|
* @param name is the framework name,
|
||||||
* @param sources framework sources,
|
* @param sources framework sources,
|
||||||
* @param bitcode bitcode embedding in the framework,
|
* @param bitcode bitcode embedding in the framework,
|
||||||
@@ -58,6 +59,9 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable {
|
|||||||
var opts: List<String> = emptyList()
|
var opts: List<String> = emptyList()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used for the framework configuration in the task's closure.
|
||||||
|
*/
|
||||||
fun framework(name: String, closure: Closure<Framework>): Framework {
|
fun framework(name: String, closure: Closure<Framework>): Framework {
|
||||||
val f = Framework(name).apply {
|
val f = Framework(name).apply {
|
||||||
closure.delegate = this
|
closure.delegate = this
|
||||||
@@ -79,7 +83,7 @@ open class FrameworkTest : DefaultTask(), KonanTestExecutable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun Language.filesFrom(dir: String): FileTree = project.fileTree(dir) {
|
fun Language.filesFrom(dir: String): FileTree = project.fileTree(dir) {
|
||||||
// include only files with
|
// include only files with the language extension
|
||||||
it.include("*${this.extension}")
|
it.include("*${this.extension}")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user