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

Merge branch 'master' into idea13

Browse Source 
Conflicts:
	idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
	idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
	libraries/stdlib/src/kotlin/properties/Properties.kt
	libraries/stdlib/test/properties/delegation/DelegationTest.kt
	libraries/stdlib/test/properties/delegation/MapDelegationTest.kt
	libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt
	update_dependencies.xml

Original commit: 8429162220
This commit is contained in:
Natalia.Ukhorskaya
2013-06-04 11:26:36 +04:00
parent 8b0054af39 005124ed27
commit 372ea911a5
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java
+10
View File
@@ -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; return annotationRootFiles;
} }