restore compilation after rebase of dropping external annotations; fix affected tests

This commit is contained in:
Dmitry Jemerov
2015-10-08 13:55:39 +02:00
parent c41aefe2cb
commit 7e2c2ef678
13 changed files with 12 additions and 72 deletions
@@ -121,8 +121,6 @@ public open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
configuration.addJvmClasspathRoots(getClasspath(paths, arguments))
configuration.addAll(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, getAnnotationsPath(paths, arguments))
configuration.put(JVMConfigurationKeys.MODULE_NAME, arguments.moduleName ?: JvmAbi.DEFAULT_MODULE_NAME)
if (arguments.module == null && arguments.freeArgs.isEmpty() && !arguments.version) {
@@ -287,17 +285,6 @@ public open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
}
return classpath
}
private fun getAnnotationsPath(paths: KotlinPaths, arguments: K2JVMCompilerArguments): List<File> {
val annotationsPath = arrayListOf<File>()
if (arguments.annotations != null) {
annotationsPath.addAll(arguments.annotations.split(File.pathSeparatorChar).map { File(it) })
}
if (!arguments.noJdkAnnotations) {
annotationsPath.add(paths.getJdkAnnotationsPath())
}
return annotationsPath
}
}
}