Don't compile Java sources of built-ins
Module 'builtins' no longer has (and is not supposed to have) Java sources
This commit is contained in:
@@ -567,7 +567,7 @@
|
||||
|
||||
<new_kotlinc src="${basedir}/core/builtins/src${path.separator}${basedir}/core/runtime.jvm/src${path.separator}${basedir}/core/reflection/src"
|
||||
output="${output}/classes/runtime"
|
||||
classpath="${basedir}/core/builtins/src${path.separator}${basedir}/core/runtime.jvm/src"/>
|
||||
classpath="${basedir}/core/runtime.jvm/src"/>
|
||||
|
||||
<javac2 destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" source="${java.target}" target="${java.target}">
|
||||
<src path="${basedir}/core/runtime.jvm/src"/>
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
package org.jetbrains.jet.codegen.forTestCompile;
|
||||
|
||||
import com.intellij.openapi.util.io.FileUtil;
|
||||
import com.intellij.util.containers.ContainerUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.JetTestUtils;
|
||||
import org.jetbrains.jet.cli.common.ExitCode;
|
||||
@@ -62,7 +61,7 @@ public class ForTestCompileRuntime {
|
||||
compileKotlinToJvm("built-ins", destDir, src, src);
|
||||
|
||||
JetTestUtils.compileJavaFiles(
|
||||
ContainerUtil.concat(javaFilesUnder(BUILT_INS_SRC_PATH), javaFilesUnder(RUNTIME_JVM_SRC_PATH)),
|
||||
javaFilesUnder(RUNTIME_JVM_SRC_PATH),
|
||||
Arrays.asList(
|
||||
"-classpath", destDir.getPath(),
|
||||
"-d", destDir.getPath()
|
||||
|
||||
Reference in New Issue
Block a user