MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

add source roots from libraries containing GWT modules to classpath for GWT compiler

Browse Source
This commit is contained in:
nik
2012-02-29 16:18:25 +04:00
parent 5e018f0d28
commit 4f64bb7ed8
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/ant/LibraryDefinitionsGeneratorFactory.java
+10 -3
View File
@@ -113,8 +113,15 @@ public class LibraryDefinitionsGeneratorFactory {
final Library library,
final File baseDir,
final CompositeGenerator libraryPath) {
genLibraryContent(genOptions, library, OrderRootType.CLASSES, baseDir, libraryPath);
}
public static void genLibraryContent(final GenerationOptions genOptions,
final Library library,
final OrderRootType rootType, final File baseDir,
final CompositeGenerator libraryPath) {
if (genOptions.expandJarDirectories) {
final VirtualFile[] files = library.getFiles(OrderRootType.CLASSES);
final VirtualFile[] files = library.getFiles(rootType);
// note that it is assumed that directory entries inside library path are unordered
TreeSet<String> visitedPaths = new TreeSet<String>();
for (final VirtualFile file : files) {
@@ -127,7 +134,7 @@ public class LibraryDefinitionsGeneratorFactory {
}
}
else {
TreeSet<String> urls = new TreeSet<String>(Arrays.asList(library.getUrls(OrderRootType.CLASSES)));
TreeSet<String> urls = new TreeSet<String>(Arrays.asList(library.getUrls(rootType)));
for (String url : urls) {
File file = fileFromUrl(url);
final String path = GenerationUtils
@@ -136,7 +143,7 @@ public class LibraryDefinitionsGeneratorFactory {
libraryPath.add(new PathElement(path));
}
else if (url.startsWith(LocalFileSystem.PROTOCOL_PREFIX)) {
if (library.isJarDirectory(url, OrderRootType.CLASSES)) {
if (library.isJarDirectory(url, rootType)) {
final FileSet fileSet = new FileSet(path);
fileSet.add(new PatternSetRef(BuildProperties.PROPERTY_LIBRARIES_PATTERNS));
libraryPath.add(fileSet);