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

[JS IR] Fix destination directory in Incremental compiler runner for JS

Browse Source
This commit is contained in:
Roman Artemev
2021-07-13 15:46:16 +03:00
committed by teamcityserver
parent d2881a7920
commit ece9307471
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt
+8 -3
View File
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.incremental
import org.jetbrains.kotlin.build.GeneratedFile import org.jetbrains.kotlin.build.GeneratedFile
import org.jetbrains.kotlin.build.report.BuildReporter import org.jetbrains.kotlin.build.report.BuildReporter
import org.jetbrains.kotlin.build.report.ICReporter import org.jetbrains.kotlin.build.report.ICReporter
import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter
import org.jetbrains.kotlin.build.report.metrics.BuildAttribute import org.jetbrains.kotlin.build.report.metrics.BuildAttribute
import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter
import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.isIrBackendEnabled import org.jetbrains.kotlin.cli.common.arguments.isIrBackendEnabled
@@ -94,8 +94,13 @@ class IncrementalJsCompilerRunner(
return IncrementalJsCachesManager(cacheDirectory, projectDir, reporter, serializerProtocol) return IncrementalJsCachesManager(cacheDirectory, projectDir, reporter, serializerProtocol)
} }
override fun destinationDir(args: K2JSCompilerArguments): File = override fun destinationDir(args: K2JSCompilerArguments): File {
File(args.outputFile).parentFile val outputFile = File(args.outputFile!!)
return if (args.isIrBackendEnabled())
outputFile
else
outputFile.parentFile
}
override fun calculateSourcesToCompileImpl( override fun calculateSourcesToCompileImpl(
caches: IncrementalJsCachesManager, caches: IncrementalJsCachesManager,