From 4213eec2a5319cf4e55ae6560c1a80c63601bb27 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 4 Mar 2013 15:28:56 +0400 Subject: [PATCH] Warning in compiler if annotations path does not exist. --- .../jet/cli/jvm/compiler/JetCoreEnvironment.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java index 4c0ee505d0b..96c406f096e 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java @@ -119,7 +119,7 @@ public class JetCoreEnvironment { addToClasspath(path); } for (File path : configuration.getList(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY)) { - addExternalAnnotationsRoot(PathUtil.jarFileOrDirectoryToVirtualFile(path)); + addExternalAnnotationsRoot(path); } for (String path : configuration.getList(CommonConfigurationKeys.SOURCE_ROOTS_KEY)) { addSources(path); @@ -145,8 +145,12 @@ public class JetCoreEnvironment { return projectEnvironment.getProject(); } - private void addExternalAnnotationsRoot(VirtualFile root) { - annotationsManager.addExternalAnnotationsRoot(root); + private void addExternalAnnotationsRoot(File path) { + if (!path.exists()) { + report(WARNING, "Annotations path entry points to a non-existent location: " + path); + return; + } + annotationsManager.addExternalAnnotationsRoot(PathUtil.jarFileOrDirectoryToVirtualFile(path)); } private void addSources(File file) {