Removed passing incremental cache base dir via module script.

compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleScriptData.java

@@ -24,10 +24,8 @@ import java.util.Collections;
 import java.util.List;
 
 public class ModuleScriptData {
-    public static final ModuleScriptData EMPTY = new ModuleScriptData(Collections.<Module>emptyList(), null);
+    public static final ModuleScriptData EMPTY = new ModuleScriptData(Collections.<Module>emptyList());
 
-    @Nullable
-    private final String incrementalCacheDir;
     @NotNull
     private final List<Module> modules;
 
@@ -36,13 +34,7 @@ public class ModuleScriptData {
         return modules;
     }
 
-    @Nullable
+    public ModuleScriptData(@NotNull List<Module> modules) {
-    public String getIncrementalCacheDir() {
-        return incrementalCacheDir;
-    }
-
-    public ModuleScriptData(@NotNull List<Module> modules, @Nullable String incrementalCacheDir) {
-        this.incrementalCacheDir = incrementalCacheDir;
         this.modules = modules;
     }
 }

compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleXmlParser.java

@@ -43,7 +43,6 @@ public class ModuleXmlParser {
     public static final String MODULE = "module";
     public static final String NAME = "name";
     public static final String OUTPUT_DIR = "outputDir";
-    public static final String INCREMENTAL_CACHE = "incrementalCache";
     public static final String SOURCES = "sources";
     public static final String PATH = "path";
     public static final String CLASSPATH = "classpath";
@@ -70,7 +69,6 @@ public class ModuleXmlParser {
     }
 
     private final MessageCollector messageCollector;
-    private String incrementalCacheDir;
     private final List<Module> modules = new SmartList<Module>();
     private DefaultHandler currentState;
 
@@ -93,7 +91,7 @@ public class ModuleXmlParser {
                     return currentState;
                 }
             });
-            return new ModuleScriptData(modules, incrementalCacheDir);
+            return new ModuleScriptData(modules);
         }
         catch (ParserConfigurationException e) {
             MessageCollectorUtil.reportException(messageCollector, e);
@@ -114,7 +112,6 @@ public class ModuleXmlParser {
                 throw createError(qName);
             }
 
-            incrementalCacheDir = attributes.getValue(INCREMENTAL_CACHE);
             setCurrentState(insideModules);
         }
     };

compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java

@@ -41,9 +41,6 @@ public class JVMConfigurationKeys {
     public static final CompilerConfigurationKey<Boolean> DISABLE_OPTIMIZATION =
             CompilerConfigurationKey.create("disable optimization");
 
-    public static final CompilerConfigurationKey<File> INCREMENTAL_CACHE_BASE_DIR =
-            CompilerConfigurationKey.create("incremental cache base dir");
-
     public static final CompilerConfigurationKey<IncrementalCacheProvider> INCREMENTAL_CACHE_PROVIDER =
             CompilerConfigurationKey.create("incremental cache provider");
 

compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java

@@ -139,9 +139,6 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments> {
                 MessageCollector sanitizedCollector = new FilteringMessageCollector(messageCollector, in(CompilerMessageSeverity.VERBOSE));
                 ModuleScriptData moduleScript = CompileEnvironmentUtil.loadModuleDescriptions(
                         paths, arguments.module, sanitizedCollector);
-                if (moduleScript.getIncrementalCacheDir() != null) {
-                    configuration.put(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR, new File(moduleScript.getIncrementalCacheDir()));
-                }
 
                 if (outputDir != null) {
                     messageCollector.report(CompilerMessageSeverity.WARNING,

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java

@@ -133,7 +133,7 @@ public class CompileEnvironmentUtil {
         if (modules.isEmpty()) {
             throw new CompileEnvironmentException("No modules where defined by " + moduleScriptFile);
         }
-        return new ModuleScriptData(modules, null);
+        return new ModuleScriptData(modules);
     }
 
     private static List<Module> runDefineModules(KotlinPaths paths, ClassFileFactory factory) {

compiler/testData/modules.xml/incrementalCacheDir.txt

@@ -1,12 +0,0 @@
-incrementalCacheDir=/incremental/cache/dir
-
-name
-	outputDir=out
-	sources=[foo]
-	classpath=[bar]
-	annotations=[]
-name2
-	outputDir=out2
-	sources=[2foo]
-	classpath=[2bar]
-	annotations=[]

compiler/testData/modules.xml/incrementalCacheDir.xml

@@ -1,10 +0,0 @@
-<modules incrementalCache="/incremental/cache/dir">
-  <module name="name" outputDir="out">
-    <sources path="foo"/>
-    <classpath path="bar"/>
-  </module>
-  <module name="name2" outputDir="out2">
-    <sources path="2foo"/>
-    <classpath path="2bar"/>
-  </module>
-</modules>

compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java

@@ -46,10 +46,6 @@ public abstract class AbstractModuleXmlParserTest extends TestCase {
         });
 
         StringBuilder sb = new StringBuilder();
-        if (result.getIncrementalCacheDir() != null) {
-            sb.append("incrementalCacheDir=").append(result.getIncrementalCacheDir()).append("\n\n");
-        }
-
         for (Module module : result.getModules()) {
             sb.append(moduleToString(module)).append("\n");
         }

compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java

@@ -56,11 +56,6 @@ public class ModuleXmlParserTestGenerated extends AbstractModuleXmlParserTest {
         doTest("compiler/testData/modules.xml/emptyModule.xml");
     }
     
-    @TestMetadata("incrementalCacheDir.xml")
-    public void testIncrementalCacheDir() throws Exception {
-        doTest("compiler/testData/modules.xml/incrementalCacheDir.xml");
-    }
-    
     @TestMetadata("manyTimes.xml")
     public void testManyTimes() throws Exception {
         doTest("compiler/testData/modules.xml/manyTimes.xml");

ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleDescriptionBuilderFactory.java

@@ -17,6 +17,6 @@
 package org.jetbrains.jet.compiler.runner;
 
 public interface KotlinModuleDescriptionBuilderFactory {
-    KotlinModuleDescriptionBuilder create(String incrementalCacheDir);
+    KotlinModuleDescriptionBuilder create();
     String getFileExtension();
 }

ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleScriptBuilderFactory.java

@@ -32,7 +32,7 @@ public class KotlinModuleScriptBuilderFactory implements KotlinModuleDescription
     private KotlinModuleScriptBuilderFactory() {}
 
     @Override
-    public KotlinModuleDescriptionBuilder create(String incrementalCacheDir) {
+    public KotlinModuleDescriptionBuilder create() {
         return new Builder();
     }
 

ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleXmlBuilderFactory.java

@@ -36,8 +36,8 @@ public class KotlinModuleXmlBuilderFactory implements KotlinModuleDescriptionBui
     private KotlinModuleXmlBuilderFactory() {}
 
     @Override
-    public KotlinModuleDescriptionBuilder create(String incrementalCacheDir) {
+    public KotlinModuleDescriptionBuilder create() {
-        return new Builder(incrementalCacheDir);
+        return new Builder();
     }
 
     @Override
@@ -50,13 +50,8 @@ public class KotlinModuleXmlBuilderFactory implements KotlinModuleDescriptionBui
         private final Printer p = new Printer(xml);
         private boolean done = false;
 
-        public Builder(String incrementalCacheDir) {
+        public Builder() {
-            if (incrementalCacheDir == null) {
+            openTag(p, MODULES);
-                openTag(p, MODULES);
-            }
-            else {
-                openTag(p, MODULES + " " + INCREMENTAL_CACHE + "=\"" + getEscapedPath(new File(incrementalCacheDir)) + "\"");
-            }
         }
 
         @Override

idea/testData/modules.xml/incrementalCache.xml

@@ -1,6 +0,0 @@
-<modules incrementalCache="/path/to/incremental/cache">
-    <!-- Module script for production -->
-    <module name="name" outputDir="output">
-        <sources path="s1"/>
-    </module>
-</modules>

idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java

@@ -28,7 +28,7 @@ import java.util.Collections;
 
 public class KotlinModuleXmlGeneratorTest extends TestCase {
     public void testBasic() throws Exception {
-        String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create(null).addModule(
+        String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create().addModule(
                 "name",
                 "output",
                 new KotlinModuleDescriptionBuilder.DependencyProvider() {
@@ -45,7 +45,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
     }
 
     public void testFiltered() throws Exception {
-        String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create(null).addModule(
+        String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create().addModule(
                 "name",
                 "output",
                 new KotlinModuleDescriptionBuilder.DependencyProvider() {
@@ -62,7 +62,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
     }
 
     public void testMultiple() throws Exception {
-        KotlinModuleDescriptionBuilder builder = KotlinModuleXmlBuilderFactory.INSTANCE.create(null);
+        KotlinModuleDescriptionBuilder builder = KotlinModuleXmlBuilderFactory.INSTANCE.create();
         builder.addModule(
                 "name",
                 "output",
@@ -92,20 +92,4 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
         String actual = builder.asText().toString();
         JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/multiple.xml"), actual);
     }
-
-    public void testIncrementalCache() throws Exception {
-        String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create("/path/to/incremental/cache").addModule(
-                "name",
-                "output",
-                new KotlinModuleDescriptionBuilder.DependencyProvider() {
-                    @Override
-                    public void processClassPath(@NotNull KotlinModuleDescriptionBuilder.DependencyProcessor processor) {
-                    }
-                },
-                Arrays.asList(new File("s1")),
-                false,
-                Collections.<File>emptySet()).asText().toString();
-        JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/incrementalCache.xml"), actual);
-    }
-
 }

jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java

@@ -62,7 +62,7 @@ public class KotlinBuilderModuleScriptGenerator {
     )
             throws IOException
     {
-        KotlinModuleDescriptionBuilder builder = FACTORY.create(getIncrementalCacheDir(context).getAbsolutePath());
+        KotlinModuleDescriptionBuilder builder = FACTORY.create();
 
         boolean noSources = true;
 
@@ -107,10 +107,6 @@ public class KotlinBuilderModuleScriptGenerator {
         return scriptFile;
     }
 
-    public static File getIncrementalCacheDir(CompileContext context) {
-        return new File(context.getProjectDescriptor().dataManager.getDataPaths().getDataStorageRoot(), "kotlin");
-    }
-
     @NotNull
     private static File getOutputDir(@NotNull ModuleBuildTarget target) {
         File outputDir = target.getOutputDir();