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

Don't compile Java sources of built-ins

Browse Source 
Module 'builtins' no longer has (and is not supposed to have) Java sources
This commit is contained in:
Alexander Udalov
2014-05-15 21:53:44 +04:00
parent c7a7f31e82
commit 3dc92c209f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+1 -1
View File
@@ -567,7 +567,7 @@
<new_kotlinc src="${basedir}/core/builtins/src${path.separator}${basedir}/core/runtime.jvm/src${path.separator}${basedir}/core/reflection/src" <new_kotlinc src="${basedir}/core/builtins/src${path.separator}${basedir}/core/runtime.jvm/src${path.separator}${basedir}/core/reflection/src"
output="${output}/classes/runtime" 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}"> <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"/> <src path="${basedir}/core/runtime.jvm/src"/>
compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
+1 -2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.codegen.forTestCompile; package org.jetbrains.jet.codegen.forTestCompile;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.cli.common.ExitCode; import org.jetbrains.jet.cli.common.ExitCode;
@@ -62,7 +61,7 @@ public class ForTestCompileRuntime {
compileKotlinToJvm("built-ins", destDir, src, src); compileKotlinToJvm("built-ins", destDir, src, src);
JetTestUtils.compileJavaFiles( JetTestUtils.compileJavaFiles(
ContainerUtil.concat(javaFilesUnder(BUILT_INS_SRC_PATH), javaFilesUnder(RUNTIME_JVM_SRC_PATH)), javaFilesUnder(RUNTIME_JVM_SRC_PATH),
Arrays.asList( Arrays.asList(
"-classpath", destDir.getPath(), "-classpath", destDir.getPath(),
"-d", destDir.getPath() "-d", destDir.getPath()