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

Use same system property to avoid deleting module file in JPS and Gradle

Browse Source
This commit is contained in:
Alexey Tsvetkov
2018-08-01 00:12:29 +03:00
parent d3dbcae7a4
commit d09629972a
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
+2
View File
@@ -34,6 +34,8 @@ import org.jetbrains.kotlin.synthetic.SAM_LOOKUP_NAME
import java.io.File import java.io.File
import java.util.* import java.util.*
const val DELETE_MODULE_FILE_PROPERTY = "kotlin.delete.module.file.after.build"
fun makeModuleFile( fun makeModuleFile(
name: String, name: String,
isTest: Boolean, isTest: Boolean,
jps-plugin/src/org/jetbrains/kotlin/jps/platforms/KotlinJvmModuleBuildTarget.kt
+2 -5
View File
@@ -28,12 +28,9 @@ import org.jetbrains.kotlin.compilerRunner.JpsCompilerEnvironment
import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.IncrementalCompilation
import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.config.Services
import org.jetbrains.kotlin.incremental.ChangesCollector import org.jetbrains.kotlin.incremental.*
import org.jetbrains.kotlin.incremental.IncrementalCompilationComponentsImpl
import org.jetbrains.kotlin.incremental.IncrementalJvmCache
import org.jetbrains.kotlin.incremental.components.ExpectActualTracker import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.incremental.updateIncrementalCache
import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.build.KotlinBuilder
import org.jetbrains.kotlin.jps.build.KotlinDirtySourceFilesHolder import org.jetbrains.kotlin.jps.build.KotlinDirtySourceFilesHolder
import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
@@ -131,7 +128,7 @@ class KotlinJvmModuleBuildTarget(compileContext: CompileContext, jpsModuleBuildT
moduleFile moduleFile
) )
} finally { } finally {
if (System.getProperty("kotlin.jps.delete.module.file.after.build") != "false") { if (System.getProperty(DELETE_MODULE_FILE_PROPERTY) != "false") {
moduleFile.delete() moduleFile.delete()
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+3 -8
View File
@@ -111,15 +111,10 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
args.destination = null args.destination = null
} }
var deleteBuildFile = true
try { try {
val res = runCompiler(K2JVM_COMPILER, args, environment) return runCompiler(K2JVM_COMPILER, args, environment)
deleteBuildFile = (res == ExitCode.OK || System.getProperty("kotlin.compiler.leave.module.file.on.error") == null) } finally {
return res if (System.getProperty(DELETE_MODULE_FILE_PROPERTY) != "false") {
}
finally {
if (deleteBuildFile) {
buildFile.delete() buildFile.delete()
} }
} }