From d974c4fd0b07e4b53a98240a51a16fa11b29cc0a Mon Sep 17 00:00:00 2001 From: "Dmitriy.Panov" Date: Thu, 6 Dec 2018 12:18:20 +0300 Subject: [PATCH] `build/jdk` made configurable to prevent cleanup on branch change (for Cherry-Pick robot) : cleanup --- .../intellij/build/impl/CompilationContextImpl.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b52bd3a52716..c362db0a68b9 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 @@ -92,9 +92,9 @@ class CompilationContextImpl implements CompilationContext { } private static String jdkDir(String projectHome) { - (System.getProperty('jdk.dir')?.with { + System.getProperty('jdk.dir')?.with { new File(it).exists() ? it : null - } ?: "$projectHome/build/jdk") + } ?: "$projectHome/build/jdk" } @SuppressWarnings(["GrUnresolvedAccess", "GroovyAssignabilityCheck"])