From 6d6e627641a9cc292c2023653ce58f29bf016c3d Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 31 May 2013 20:26:18 +0400 Subject: [PATCH] Support custom JDK annotations path for TeamCity --- .../jps/build/KotlinBuilderModuleScriptGenerator.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index ce53354d6ad..593cf2407c6 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -130,6 +130,16 @@ public class KotlinBuilderModuleScriptGenerator { } } + // JDK is stored locally on user's machine, so its configuration, including external annotation paths + // is not available on TeamCity. When running on TeamCity, one has to provide extra path to JDK annotations + String extraAnnotationsPaths = System.getProperty("jps.kotlin.extra.annotation.paths"); + if (extraAnnotationsPaths != null) { + String[] paths = extraAnnotationsPaths.split(File.pathSeparator); + for (String path : paths) { + annotationRootFiles.add(new File(path)); + } + } + return annotationRootFiles; }