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

Separate environments for module script compilation and project compilation

Browse Source
This commit is contained in:
Andrey Breslav
2012-04-11 15:47:34 +04:00
parent f34e492022
commit b5008ebd57
7 changed files with 343 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetLiteFixture.java
+2 -2
View File
@@ -30,7 +30,7 @@ import com.intellij.testFramework.LightVirtualFile;
import com.intellij.testFramework.TestDataFile;
import com.intellij.testFramework.UsefulTestCase;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.jet.compiler.CompileEnvironment;
import org.jetbrains.jet.compiler.CompileEnvironmentUtil;
import org.jetbrains.jet.compiler.JetCoreEnvironment;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
@@ -77,7 +77,7 @@ public abstract class JetLiteFixture extends UsefulTestCase {
protected void createEnvironmentWithFullJdk() {
myEnvironment = new JetCoreEnvironment(getTestRootDisposable(),
CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR));
final File rtJar = CompileEnvironment.findRtJar();
final File rtJar = CompileEnvironmentUtil.findRtJar();
myEnvironment.addToClasspath(rtJar);
}
compiler/tests/org/jetbrains/jet/compiler/CompileJavaAgainstKotlinTest.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class CompileJavaAgainstKotlinTest extends TestCaseWithTmpdir {
ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
CompileEnvironment.writeToOutputDirectory(classFileFactory, tmpdir.getPath());
CompileEnvironmentUtil.writeToOutputDirectory(classFileFactory, tmpdir.getPath());
Disposer.dispose(myTestRootDisposable);
compiler/tests/org/jetbrains/jet/compiler/CompileKotlinAgainstKotlinTest.java
+2 -2
View File
@@ -91,7 +91,7 @@ public class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir {
ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
CompileEnvironment.writeToOutputDirectory(classFileFactory, aDir.getPath());
CompileEnvironmentUtil.writeToOutputDirectory(classFileFactory, aDir.getPath());
Disposer.dispose(myTestRootDisposable);
}
@@ -109,7 +109,7 @@ public class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir {
ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
CompileEnvironment.writeToOutputDirectory(classFileFactory, bDir.getPath());
CompileEnvironmentUtil.writeToOutputDirectory(classFileFactory, bDir.getPath());
Disposer.dispose(myTestRootDisposable);
}
compiler/tests/org/jetbrains/jet/compiler/ReadKotlinBinaryClassTest.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir {
ClassFileFactory classFileFactory = state.getFactory();
CompileEnvironment.writeToOutputDirectory(classFileFactory, tmpdir.getPath());
CompileEnvironmentUtil.writeToOutputDirectory(classFileFactory, tmpdir.getPath());
NamespaceDescriptor namespaceFromSource = state.getBindingContext().get(BindingContext.FILE_TO_NAMESPACE, psiFile);
compiler/tests/org/jetbrains/jet/compiler/WriteSignatureTest.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class WriteSignatureTest extends TestCaseWithTmpdir {
ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
CompileEnvironment.writeToOutputDirectory(classFileFactory, tmpdir.getPath());
CompileEnvironmentUtil.writeToOutputDirectory(classFileFactory, tmpdir.getPath());
Disposer.dispose(myTestRootDisposable);