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
compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
+6 -2
View File
@@ -125,7 +125,11 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments> {
if (arguments.module != null) {
MessageCollector sanitizedCollector = new FilteringMessageCollector(messageCollector, in(CompilerMessageSeverity.VERBOSE));
List<Module> modules = CompileEnvironmentUtil.loadModuleDescriptions(paths, arguments.module, sanitizedCollector);
CompileEnvironmentUtil.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, "The '-output' option is ignored because '-module' is specified",
@@ -133,7 +137,7 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments> {
}
File directory = new File(arguments.module).getAbsoluteFile().getParentFile();
KotlinToJVMBytecodeCompiler.compileModules(configuration, modules,
KotlinToJVMBytecodeCompiler.compileModules(configuration, moduleScript.getModules(),
directory, jar,
arguments.includeRuntime);
}
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+39 -14
View File
@@ -20,6 +20,7 @@ import com.google.common.collect.Lists;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.vfs.StandardFileSystems;
@@ -80,32 +81,38 @@ public class CompileEnvironmentUtil {
}
@NotNull
public static List<Module> loadModuleDescriptions(KotlinPaths paths, String moduleDefinitionFile, MessageCollector messageCollector) {
public static ModuleScriptData loadModuleDescriptions(KotlinPaths paths, String moduleDefinitionFile, MessageCollector messageCollector) {
File file = new File(moduleDefinitionFile);
if (!file.exists()) {
messageCollector.report(ERROR, "Module definition file does not exist: " + moduleDefinitionFile, NO_LOCATION);
return Collections.emptyList();
return new ModuleScriptData(Collections.<Module>emptyList(), null);
}
String extension = FileUtilRt.getExtension(moduleDefinitionFile);
if ("ktm".equalsIgnoreCase(extension)) {
return loadModuleScript(paths, moduleDefinitionFile, messageCollector);
}
if ("xml".equalsIgnoreCase(extension)) {
return ContainerUtil.map(
ModuleXmlParser.parse(moduleDefinitionFile, messageCollector),
Pair<List<ModuleDescription>, String> moduleDescriptionsAndIncrementalCacheDir =
ModuleXmlParser.parseModuleDescriptionsAndIncrementalCacheDir(moduleDefinitionFile, messageCollector);
List<ModuleDescription> moduleDescriptions = moduleDescriptionsAndIncrementalCacheDir.first;
String incrementalCacheDir = moduleDescriptionsAndIncrementalCacheDir.second;
List<Module> modules = ContainerUtil.map(
moduleDescriptions,
new Function<ModuleDescription, Module>() {
@Override
public Module fun(ModuleDescription description) {
return new DescriptionToModuleAdapter(description);
}
});
}
);
return new ModuleScriptData(modules, incrementalCacheDir);
}
messageCollector.report(ERROR, "Unknown module definition type: " + moduleDefinitionFile, NO_LOCATION);
return Collections.emptyList();
return new ModuleScriptData(Collections.<Module>emptyList(), null);
}
@NotNull
private static List<Module> loadModuleScript(KotlinPaths paths, String moduleScriptFile, MessageCollector messageCollector) {
private static ModuleScriptData loadModuleScript(KotlinPaths paths, String moduleScriptFile, MessageCollector messageCollector) {
CompilerConfiguration configuration = new CompilerConfiguration();
File runtimePath = paths.getRuntimePath();
if (runtimePath.exists()) {
@@ -143,7 +150,7 @@ public class CompileEnvironmentUtil {
if (modules.isEmpty()) {
throw new CompileEnvironmentException("No modules where defined by " + moduleScriptFile);
}
return modules;
return new ModuleScriptData(modules, null);
}
private static List<Module> runDefineModules(KotlinPaths paths, ClassFileFactory factory) {
@@ -324,7 +331,30 @@ public class CompileEnvironmentUtil {
return result;
}
static class DescriptionToModuleAdapter implements Module {
public static class ModuleScriptData {
@Nullable
private final String incrementalCacheDir;
@NotNull
public List<Module> getModules() {
return modules;
}
@Nullable
public String getIncrementalCacheDir() {
return incrementalCacheDir;
}
@NotNull
private final List<Module> modules;
ModuleScriptData(@NotNull List<Module> modules, @Nullable String incrementalCacheDir) {
this.incrementalCacheDir = incrementalCacheDir;
this.modules = modules;
}
}
private static class DescriptionToModuleAdapter implements Module {
private final ModuleDescription description;
public DescriptionToModuleAdapter(ModuleDescription description) {
@@ -360,10 +390,5 @@ public class CompileEnvironmentUtil {
public List<String> getAnnotationsRoots() {
return description.getAnnotationsRoots();
}
@Nullable
public String getIncrementalCacheDir() {
return description.getIncrementalCacheDir();
}
}
}
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
-8
View File
@@ -169,14 +169,6 @@ public class KotlinToJVMBytecodeCompiler {
configuration.add(JVMConfigurationKeys.MODULE_IDS, module.getModuleName());
}
Module anyModule = chunk.get(0);
if (anyModule instanceof CompileEnvironmentUtil.DescriptionToModuleAdapter) {
String incrementalCacheDir = ((CompileEnvironmentUtil.DescriptionToModuleAdapter) anyModule).getIncrementalCacheDir();
if (incrementalCacheDir != null) {
configuration.put(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR, new File(incrementalCacheDir));
}
}
return configuration;
}