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

Using annotations from reexported libraries

Browse Source
This commit is contained in:
Andrey Breslav
2013-08-29 20:02:47 +04:00
parent 323bbe00cc
commit 1e91fb8d27
10 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java
+16 -22
View File
@@ -27,17 +27,13 @@ import org.jetbrains.jps.incremental.CompileContext;
import org.jetbrains.jps.incremental.ModuleBuildTarget;
import org.jetbrains.jps.incremental.messages.BuildMessage;
import org.jetbrains.jps.incremental.messages.CompilerMessage;
import org.jetbrains.jps.model.java.JpsAnnotationRootType;
import org.jetbrains.jps.model.java.JpsJavaClasspathKind;
import org.jetbrains.jps.model.java.JpsJavaDependenciesEnumerator;
import org.jetbrains.jps.model.java.JpsJavaExtensionService;
import org.jetbrains.jps.model.JpsDummyElement;
import org.jetbrains.jps.model.java.*;
import org.jetbrains.jps.model.library.JpsLibrary;
import org.jetbrains.jps.model.library.JpsLibraryRoot;
import org.jetbrains.jps.model.library.sdk.JpsSdk;
import org.jetbrains.jps.model.module.JpsDependencyElement;
import org.jetbrains.jps.model.module.JpsLibraryDependency;
import org.jetbrains.jps.model.module.JpsModule;
import org.jetbrains.jps.model.module.JpsSdkDependency;
import org.jetbrains.jps.util.JpsPathUtil;
import java.io.File;
import java.io.IOException;
@@ -92,11 +88,8 @@ public class KotlinBuilderModuleScriptGenerator {
@NotNull
private static Collection<File> findClassPathRoots(@NotNull ModuleBuildTarget target) {
JpsModule module = target.getModule();
JpsJavaDependenciesEnumerator dependencies = JpsJavaExtensionService.dependencies(module).recursively().exportedOnly()
.includedIn(JpsJavaClasspathKind.compile(target.isTests()));
return dependencies.classes().getRoots();
return getAllDependencies(target).classes().getRoots();
}
@NotNull
@@ -114,20 +107,15 @@ public class KotlinBuilderModuleScriptGenerator {
@NotNull
private static List<File> findAnnotationRoots(@NotNull ModuleBuildTarget target) {
JpsModule module = target.getModule();
List<JpsDependencyElement> dependencies = module.getDependenciesList().getDependencies();
List<File> annotationRootFiles = ContainerUtil.newArrayList();
for (JpsDependencyElement dependencyElement : dependencies) {
JpsLibrary library = getLibrary(dependencyElement);
if (library == null) continue;
List<JpsLibraryRoot> annotationRoots = library.getRoots(JpsAnnotationRootType.INSTANCE);
for (JpsLibraryRoot root : annotationRoots) {
File file = new File(JpsPathUtil.urlToPath(root.getUrl()));
JpsSdk<JpsDummyElement> sdk = target.getModule().getSdk(JpsJavaSdkType.INSTANCE);
if (sdk != null) {
annotationRootFiles.addAll(sdk.getParent().getFiles(JpsAnnotationRootType.INSTANCE));
}
annotationRootFiles.add(file);
}
for (JpsLibrary library : getAllDependencies(target).getLibraries()) {
annotationRootFiles.addAll(library.getFiles(JpsAnnotationRootType.INSTANCE));
}
// JDK is stored locally on user's machine, so its configuration, including external annotation paths
@@ -143,6 +131,12 @@ public class KotlinBuilderModuleScriptGenerator {
return annotationRootFiles;
}
@NotNull
private static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) {
return JpsJavaExtensionService.dependencies(target.getModule()).recursively().exportedOnly()
.includedIn(JpsJavaClasspathKind.compile(target.isTests()));
}
@Nullable
private static JpsLibrary getLibrary(@NotNull JpsDependencyElement dependencyElement) {
if (dependencyElement instanceof JpsSdkDependency) {