From b6298108e1c6a3a84de04ddbf059bfbceee50378 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 23 Mar 2017 16:55:54 +0300 Subject: [PATCH] build scripts: use proper path to project output directory --- .../intellij/build/impl/CompilationContextImpl.groovy | 6 +++++- 1 file changed, 5 insertions(+), 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 30f07f09f4af..5807c9c52383 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 @@ -130,7 +130,7 @@ class CompilationContextImpl implements CompilationContext { projectBuilder.targetFolder = classesOutput } else { - def outputDir = JpsPathUtil.urlToFile(JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(project).outputUrl) + def outputDir = getProjectOutputDirectory() if (!outputDir.exists()) { messages.error("$BuildOptions.USE_COMPILED_CLASSES_PROPERTY is enabled, but the project output directory $outputDir.absolutePath doesn't exist") } @@ -141,6 +141,10 @@ class CompilationContextImpl implements CompilationContext { cleanOutput(outputDirectoriesToKeep) } + File getProjectOutputDirectory() { + JpsPathUtil.urlToFile(JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(project).outputUrl) + } + void cleanOutput(List outputDirectoriesToKeep) { messages.block("Clean output") { def outputPath = paths.buildOutputRoot