From f6afc53e3d165419798614b0f11aefd7c660eedb Mon Sep 17 00:00:00 2001 From: Constantine Plotnikov Date: Thu, 12 Aug 2010 19:07:03 +0400 Subject: [PATCH] ant generation: Entries for module dependencies are not skipped for production compilation classes --- .../com/intellij/compiler/ant/ModuleChunkClasspath.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkClasspath.java b/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkClasspath.java index 49dca1efd178..c25df077e8a2 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkClasspath.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkClasspath.java @@ -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) {