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 String getIncrementalCacheDir() {
-        return incrementalCacheDir;
-    }
-
-    public ModuleScriptData(@NotNull List<Module> modules, @Nullable String incrementalCacheDir) {
-        this.incrementalCacheDir = incrementalCacheDir;
+    public ModuleScriptData(@NotNull List<Module> modules) {
         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) {