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

Fixed compilation in build-tools

Browse Source
This commit is contained in:
Andrey Breslav
2012-04-24 20:58:09 +04:00
parent 0ab212b240
commit deaaf3042b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/build-tools.iml
+1
View File
@@ -10,6 +10,7 @@
<orderEntry type="module" module-name="cli" /> <orderEntry type="module" module-name="cli" />
<orderEntry type="library" name="intellij-core" level="project" /> <orderEntry type="library" name="intellij-core" level="project" />
<orderEntry type="module" module-name="frontend.java" /> <orderEntry type="module" module-name="frontend.java" />
<orderEntry type="module" module-name="runtime" />
</component> </component>
</module> </module>
build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
+4 -1
View File
@@ -16,6 +16,7 @@
package org.jetbrains.jet.buildtools.core; package org.jetbrains.jet.buildtools.core;
import jet.modules.Module;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.compiler.*; import org.jetbrains.jet.compiler.*;
@@ -139,7 +140,9 @@ public class BytecodeCompiler {
public void moduleToJar ( @NotNull String module, @NotNull String jar, boolean includeRuntime, @Nullable String stdlib, @Nullable String[] classpath ) { public void moduleToJar ( @NotNull String module, @NotNull String jar, boolean includeRuntime, @Nullable String stdlib, @Nullable String[] classpath ) {
try { try {
CompileEnvironmentConfiguration env = env(stdlib, classpath); CompileEnvironmentConfiguration env = env(stdlib, classpath);
boolean success = KotlinToJVMBytecodeCompiler.compileModules(env, module, jar, null, includeRuntime); List<Module> modules = CompileEnvironmentUtil.loadModuleScript(module, env.getMessageCollector());
File directory = new File(module).getParentFile();
boolean success = KotlinToJVMBytecodeCompiler.compileModules(env, modules, directory, jar, null, includeRuntime);
if ( ! success ) { if ( ! success ) {
throw new CompileEnvironmentException( errorMessage( module, false )); throw new CompileEnvironmentException( errorMessage( module, false ));
} }