diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleScriptData.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleScriptData.java index 727bccf305d..1fcdb6e4e3a 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleScriptData.java +++ b/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.emptyList(), null); + public static final ModuleScriptData EMPTY = new ModuleScriptData(Collections.emptyList()); - @Nullable - private final String incrementalCacheDir; @NotNull private final List modules; @@ -36,13 +34,7 @@ public class ModuleScriptData { return modules; } - @Nullable - public String getIncrementalCacheDir() { - return incrementalCacheDir; - } - - public ModuleScriptData(@NotNull List modules, @Nullable String incrementalCacheDir) { - this.incrementalCacheDir = incrementalCacheDir; + public ModuleScriptData(@NotNull List modules) { this.modules = modules; } } diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleXmlParser.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleXmlParser.java index 6ecd7b56ef6..9861e676a60 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleXmlParser.java +++ b/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 modules = new SmartList(); 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); } }; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java index 46196affaea..45343574012 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java @@ -41,9 +41,6 @@ public class JVMConfigurationKeys { public static final CompilerConfigurationKey DISABLE_OPTIMIZATION = CompilerConfigurationKey.create("disable optimization"); - public static final CompilerConfigurationKey INCREMENTAL_CACHE_BASE_DIR = - CompilerConfigurationKey.create("incremental cache base dir"); - public static final CompilerConfigurationKey INCREMENTAL_CACHE_PROVIDER = CompilerConfigurationKey.create("incremental cache provider"); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java index 136a7ee94dc..d4c23c7127e 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java @@ -139,9 +139,6 @@ public class K2JVMCompiler extends CLICompiler { 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, diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java index 717f7b3661c..56e4c1e2b4a 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/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 runDefineModules(KotlinPaths paths, ClassFileFactory factory) { diff --git a/compiler/testData/modules.xml/incrementalCacheDir.txt b/compiler/testData/modules.xml/incrementalCacheDir.txt deleted file mode 100644 index 9a325af675c..00000000000 --- a/compiler/testData/modules.xml/incrementalCacheDir.txt +++ /dev/null @@ -1,12 +0,0 @@ -incrementalCacheDir=/incremental/cache/dir - -name - outputDir=out - sources=[foo] - classpath=[bar] - annotations=[] -name2 - outputDir=out2 - sources=[2foo] - classpath=[2bar] - annotations=[] diff --git a/compiler/testData/modules.xml/incrementalCacheDir.xml b/compiler/testData/modules.xml/incrementalCacheDir.xml deleted file mode 100644 index e32453e8d4f..00000000000 --- a/compiler/testData/modules.xml/incrementalCacheDir.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java b/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java index e0c56cdc813..e4eba5ede86 100644 --- a/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java +++ b/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"); } diff --git a/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java b/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java index b201d9196df..a59c51a4b6f 100644 --- a/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java +++ b/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"); diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleDescriptionBuilderFactory.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleDescriptionBuilderFactory.java index 8ffcda7dd6d..dbeb4e07903 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleDescriptionBuilderFactory.java +++ b/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(); } diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleScriptBuilderFactory.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleScriptBuilderFactory.java index 9b3ead6867f..30c8d04a5bd 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleScriptBuilderFactory.java +++ b/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(); } diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleXmlBuilderFactory.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleXmlBuilderFactory.java index 2fd7ff2928f..6ee32443ef6 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleXmlBuilderFactory.java +++ b/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) { - return new Builder(incrementalCacheDir); + public KotlinModuleDescriptionBuilder create() { + 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) { - if (incrementalCacheDir == null) { - openTag(p, MODULES); - } - else { - openTag(p, MODULES + " " + INCREMENTAL_CACHE + "=\"" + getEscapedPath(new File(incrementalCacheDir)) + "\""); - } + public Builder() { + openTag(p, MODULES); } @Override diff --git a/idea/testData/modules.xml/incrementalCache.xml b/idea/testData/modules.xml/incrementalCache.xml deleted file mode 100644 index 50b2897af0f..00000000000 --- a/idea/testData/modules.xml/incrementalCache.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java b/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java index 439b040a062..a2cfd26c09a 100644 --- a/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java +++ b/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.emptySet()).asText().toString(); - JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/incrementalCache.xml"), actual); - } - } diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 9313558cc2c..6a08f7222c7 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/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();