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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
anna
2012-04-30 16:32:21 +02:00
parent 28faebc0e9 4890bb9b33
commit dd34e1e538
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/model/src/org/jetbrains/jps/Module.groovy
+5 -2
View File
@@ -73,8 +73,11 @@ class Module extends LazyInitializeableObject implements ClasspathItem {//}, Com
excludes = new ArrayList<String>(ownExcludes)
Set<String> allContentRoots = project.modules.values().collect { it.contentRoots }.flatten() as Set
Set<File> myRoots = contentRoots.collect { new File(it) } as Set
Collection<String> newExcludes = (allContentRoots - contentRoots).findAll { PathUtil.isUnder(myRoots, new File(it)) }.collect { FileUtil.toCanonicalPath(it) }
excludes.addAll(newExcludes)
for (root in allContentRoots) {
if (!(root in contentRoots) && PathUtil.isUnder(myRoots, new File(root))) {
excludes << FileUtil.toCanonicalPath(root)
}
}
}
return excludes
}
jps/model/src/org/jetbrains/jps/idea/IdeaProjectLoader.groovy
+7 -3
View File
@@ -367,9 +367,13 @@ public class IdeaProjectLoader {
imlPaths.each { loadModule(it) }
Set<String> allContentRoots = project.modules.values().collect { it.contentRoots }.flatten() as Set
project.modules.values().each { module ->
Set<File> myRoots = module.contentRoots.collect { new File(it) } as Set
Collection<String> newExcludes = (allContentRoots - module.contentRoots).findAll { PathUtil.isUnder(myRoots, new File(it)) }.collect { FileUtil.toCanonicalPath(it) }
module.excludes.addAll(newExcludes)
def ownRootPaths = module.contentRoots
Set<File> myRoots = ownRootPaths.collect { new File(it) } as Set
for (root in allContentRoots) {
if (!(root in ownRootPaths) && PathUtil.isUnder(myRoots, new File(root))) {
module.excludes << FileUtil.toCanonicalPath(root)
}
}
}
}