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

Support building many modules "as one": merging all the paths etc

Browse Source 
This is for a workaround implementation of support for mutually dependent modules
This commit is contained in:
Andrey Breslav
2013-10-09 21:46:45 +04:00
parent eff62bfd83
commit d5b08d4f1c
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ChunkAsOneModule.kt
+17
View File
@@ -0,0 +1,17 @@
package org.jetbrains.jet.cli.jvm.compiler
import jet.modules.Module
class ChunkAsOneModule(private val chunk: ModuleChunk) : Module {
override fun getModuleName(): String = "chunk" + chunk.getModules().map { it.getModuleName() }.toString()
override fun getOutputDirectory(): String {
throw UnsupportedOperationException("Each module in a chunk has its own output directory")
}
override fun getSourceFiles(): List<String> = chunk.getModules().flatMap { it.getSourceFiles() }
override fun getClasspathRoots(): List<String> = chunk.getModules().flatMap { it.getClasspathRoots() }
override fun getAnnotationsRoots(): List<String> = chunk.getModules().flatMap { it.getAnnotationsRoots() }
}
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+13 -5
View File
@@ -63,17 +63,20 @@ import java.util.List;
public class KotlinToJVMBytecodeCompiler {
private static final boolean COMPILE_CHUNK_AS_ONE_MODULE = true;
private KotlinToJVMBytecodeCompiler() {
}
@Nullable
public static ClassFileFactory compileModule(CompilerConfiguration configuration, Module module, File directory) {
if (module.getSourceFiles().isEmpty()) {
List<String> sourceFiles = module.getSourceFiles();
if (sourceFiles.isEmpty()) {
throw new CompileEnvironmentException("No source files where defined in module " + module.getModuleName());
}
CompilerConfiguration compilerConfiguration = configuration.copy();
for (String sourceFile : module.getSourceFiles()) {
for (String sourceFile : sourceFiles) {
File source = new File(sourceFile);
if (!source.isAbsolute()) {
source = new File(directory, sourceFile);
@@ -126,12 +129,16 @@ public class KotlinToJVMBytecodeCompiler {
public static boolean compileModules(
CompilerConfiguration configuration,
@NotNull final ModuleChunk modules,
@NotNull final ModuleChunk chunk,
@NotNull File directory,
@Nullable File jarPath,
boolean jarRuntime
) {
for (Module module : modules.getModules()) {
List<Module> modules = chunk.getModules();
if (COMPILE_CHUNK_AS_ONE_MODULE && modules.size() > 1) {
modules = Collections.<Module>singletonList(new ChunkAsOneModule(chunk));
}
for (Module module : modules) {
ClassFileFactory moduleFactory = compileModule(configuration, module, directory);
if (moduleFactory == null) {
return false;
@@ -141,7 +148,8 @@ public class KotlinToJVMBytecodeCompiler {
@Override
public File getOutputDirectory(@NotNull Collection<File> sourceFiles) {
for (File sourceFile : sourceFiles) {
Module module = modules.findModuleBySourceFile(sourceFile);
// Note that here we track original modules:
Module module = chunk.findModuleBySourceFile(sourceFile);
if (module != null) {
return new File(module.getOutputDirectory());
}