ant generation: Entries for module dependencies are not skipped for production compilation classes

This commit is contained in:
Constantine Plotnikov
2010-08-12 19:13:39 +04:00
parent cbcb419d54
commit f6afc53e3d
@@ -108,7 +108,9 @@ public class ModuleChunkClasspath extends Path {
return true;
}
if (!generateRuntimeClasspath && !(orderEntry instanceof ModuleOrderEntry)) {
if (!generateRuntimeClasspath &&
!(orderEntry instanceof ModuleOrderEntry) &&
!(orderEntry instanceof ModuleSourceOrderEntry)) {
// needed for compilation classpath only
final boolean isExported = (orderEntry instanceof ExportableOrderEntry) && ((ExportableOrderEntry)orderEntry).isExported();
if (dependencyLevel > 0 && !isExported) {
@@ -119,7 +121,8 @@ public class ModuleChunkClasspath extends Path {
if (orderEntry instanceof JdkOrderEntry) {
if (genOptions.forceTargetJdk && !generateRuntimeClasspath) {
pathItems.add(new PathRefItem(BuildProperties.propertyRef(BuildProperties.getModuleChunkJdkClasspathProperty(chunk.getName()))));
pathItems
.add(new PathRefItem(BuildProperties.propertyRef(BuildProperties.getModuleChunkJdkClasspathProperty(chunk.getName()))));
}
}
else if (orderEntry instanceof ModuleOrderEntry) {