azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Writing incrementalCache attribute to <modules> element of xml module script

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-06-18 17:05:49 +04:00
parent 06cafe7f12
commit f6129732a2
18 changed files with 141 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java
+1 -2
View File
@@ -168,10 +168,9 @@ public class K2JvmTranslatingCompiler implements TranslatingCompiler {
if (!tests) {
outputDirectoriesToFilter.add(moduleOutputDirectory);
}
CharSequence script = KotlinModuleScriptBuilderFactory.INSTANCE.create().addModule(
CharSequence script = KotlinModuleScriptBuilderFactory.INSTANCE.create(null).addModule(
moduleName,
moduleOutputDirectory.getAbsolutePath(),
null,
getDependencyProvider(chunk, tests, mainOutput),
sourceFiles,
tests,
idea/testData/modules.xml/incrementalCache.xml
+6
View File
@@ -0,0 +1,6 @@
<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
+19 -7
View File
@@ -28,10 +28,9 @@ import java.util.Collections;
public class KotlinModuleXmlGeneratorTest extends TestCase {
public void testBasic() throws Exception {
String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create().addModule(
String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create(null).addModule(
"name",
"output",
null,
new KotlinModuleDescriptionBuilder.DependencyProvider() {
@Override
public void processClassPath(@NotNull KotlinModuleDescriptionBuilder.DependencyProcessor processor) {
@@ -46,10 +45,9 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
}
public void testFiltered() throws Exception {
String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create().addModule(
String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create(null).addModule(
"name",
"output",
null,
new KotlinModuleDescriptionBuilder.DependencyProvider() {
@Override
public void processClassPath(@NotNull KotlinModuleDescriptionBuilder.DependencyProcessor processor) {
@@ -64,11 +62,10 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
}
public void testMultiple() throws Exception {
KotlinModuleDescriptionBuilder builder = KotlinModuleXmlBuilderFactory.INSTANCE.create();
KotlinModuleDescriptionBuilder builder = KotlinModuleXmlBuilderFactory.INSTANCE.create(null);
builder.addModule(
"name",
"output",
null,
new KotlinModuleDescriptionBuilder.DependencyProvider() {
@Override
public void processClassPath(@NotNull KotlinModuleDescriptionBuilder.DependencyProcessor processor) {
@@ -82,7 +79,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
builder.addModule(
"name2",
"output2",
null,
new KotlinModuleDescriptionBuilder.DependencyProvider() {
@Override
public void processClassPath(@NotNull KotlinModuleDescriptionBuilder.DependencyProcessor processor) {
@@ -96,4 +92,20 @@ 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);
}
}