From 66a38c80547c4208715fcbbe169234bbdc63ee68 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 11 Aug 2017 15:50:08 +0300 Subject: [PATCH] build scripts: don't use separate directory for incremental compilation caches Since incremental compilation don't watch for changes in output directories and the both incremental and non-incremental compilation have the same output directory, using a different caches directory may lead to problems if non-incremental compilation is invoked between two incremental. Also this makes it simpler to recover from bugs in incremental compilation, we just need to run compilation in non-incremental mode and it'll clear caches. --- .../jetbrains/intellij/build/impl/CompilationContextImpl.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy index d7243bcf2a36..c02dfb7031e6 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy @@ -152,7 +152,7 @@ class CompilationContextImpl implements CompilationContext { void prepareForBuild() { checkCompilationOptions() - def dataDirName = options.incrementalCompilation ? ".jps-build-data-incremental" : ".jps-build-data" + def dataDirName = ".jps-build-data" def logDir = new File(paths.buildOutputRoot, "log") FileUtil.delete(logDir) compilationData = new JpsCompilationData(new File(paths.buildOutputRoot, dataDirName), new File("$logDir/compilation.log"),