gradle-plugin: Remove manifest compilation parameter

This commit is contained in:
Ilya Matveev
2017-09-07 17:38:52 +03:00
committed by ilmat192
parent 016893991a
commit 5e1866f262
3 changed files with 0 additions and 41 deletions
-2
View File
@@ -242,8 +242,6 @@ For this project the task graph will be the following:
enableAssertions() // Enable assertions in binaries generated.
enableDebug() // Enable debugging for binaries generated.
manifest 'path/to/manifest.file' // A manifest addend file.
// Arguments to be passed to a linker.
linkerOpts 'Some linker opts'
@@ -95,9 +95,6 @@ open class KonanCompileTask: KonanTargetableTask() {
@Optional @Input var apiVersion : String? = null
internal set
@Optional @InputFile var manifest : File? = null
internal set
@Input var dumpParameters: Boolean = false
// TODO: Is there a better way to rerun tasks when the compiler version changes?
@Input val konanVersion = project.konanVersion
@@ -116,8 +113,6 @@ open class KonanCompileTask: KonanTargetableTask() {
addArgIfNotNull("-target", target)
addArgIfNotNull("-language-version", languageVersion)
addArgIfNotNull("-api-version", apiVersion)
// TODO: Should we get manifests of the interops used?
addArgIfNotNull("-manifest", manifest?.canonicalPath)
addKey("-g", enableDebug)
addKey("-nostdlib", noStdLib)
@@ -229,10 +224,6 @@ open class KonanCompileConfig(
_linkerOpts.addAll(args)
}
fun manifest(arg: Any) = with(compilationTask) {
manifest = project.file(arg)
}
fun target(tgt: String) = with(compilationTask) {
target = tgt
}
@@ -175,36 +175,6 @@ class IncrementalSpecification extends BaseKonanSpecification {
onlyRecompilationHappened(*results)
}
def 'manifest parameter change for a compilation task should cause only recompilation'() {
when:
def project = KonanInteropProject.createEmpty(projectDirectory) { KonanInteropProject it ->
it.generateSrcFile('main.kt')
}
def results = buildTwice(project) { KonanInteropProject it ->
def manifest = it.generateSrcFile('manifest', "#some manifest file")
it.addCompilationSetting("main", "manifest", manifest)
}
then:
onlyRecompilationHappened(*results)
}
def 'manifest file change should cause only recompilation'() {
when:
def manifest
def project = KonanInteropProject.createEmpty(projectDirectory) { KonanInteropProject it ->
it.generateSrcFile('main.kt')
manifest = it.generateSrcFile('manifest', "#some manifest file\n")
it.addCompilationSetting("main", "manifest", manifest)
}
def results = buildTwice(project) { KonanInteropProject it ->
manifest.append("#something else\n")
}
then:
onlyRecompilationHappened(*results)
}
@Unroll("#parameter change for an interop task should cause recompilation and interop reprocessing")
def 'Parameter change for an interop task should cause recompilation and interop reprocessing'() {
when: