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

Fixes after review

Browse Source
This commit is contained in:
Ilya Chernikov
2018-01-15 12:49:50 +01:00
committed by Vyacheslav Gerasimov
parent 14e586d5a5
commit 058ef31d7a
15 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/build.gradle.kts
+2 -2
View File
@@ -86,8 +86,8 @@ projectTest {
workingDir = rootDir
systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))
doFirst {
systemProperty("ant.classpath", antLauncherJar.asPath)
systemProperty("ant.launcher.class", "org.apache.tools.ant.Main")
systemProperty("kotlin.ant.classpath", antLauncherJar.asPath)
systemProperty("kotlin.ant.launcher.class", "org.apache.tools.ant.Main")
systemProperty("idea.home.path", intellijRootDir().canonicalPath)
}
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+3 -1
View File
@@ -527,7 +527,9 @@ class KotlinCoreEnvironment private constructor(
?: PathUtil.getResourcePathForClass(this::class.java).takeIf { it.hasConfigFile(configFilePath) }
// hack for load extensions when compiler run directly from project directory (e.g. in tests)
?: File("compiler/cli/src").takeIf { it.hasConfigFile(configFilePath) }
?: throw IllegalStateException("Unable to find extension point configuration $configFilePath (cp:\n ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n ") { it.file }})")
?: throw IllegalStateException(
"Unable to find extension point configuration $configFilePath " +
"(cp:\n ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n ") { it.file }})")
CoreApplicationEnvironment.registerExtensionPointAndExtensions(pluginRoot, configFilePath, Extensions.getRootArea())
}
compiler/frontend/buildLexer.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<project name="KotlinLexer" default="lexer">
<property name="home" value="${basedir}"/>
<property name="builddir" value="${basedir}/build"/>
<property name="flex.classpath" value="${home}/../../dependencies/jflex/JFlex.jar"/>
<property name="flex.classpath" value=""/>
<property name="out.dir" value="${builddir}/tmpout"/>
<macrodef name="flex">
compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java
+4 -4
View File
@@ -25,14 +25,14 @@ public abstract class AbstractAntTaskTest extends KotlinIntegrationTestBase {
protected void doTest(String testFile) throws Exception {
String testDataDir = new File(testFile).getAbsolutePath();
String antClasspath = System.getProperty("ant.classpath");
String antClasspath = System.getProperty("kotlin.ant.classpath");
if (antClasspath == null) {
throw new RuntimeException("Unable to get a valid classpath from 'ant.classpath' property, please set it accordingly");
throw new RuntimeException("Unable to get a valid classpath from 'kotlin.ant.classpath' property, please set it accordingly");
}
String antLauncherClass = System.getProperty("ant.launcher.class");
String antLauncherClass = System.getProperty("kotlin.ant.launcher.class");
if (antLauncherClass == null) {
throw new RuntimeException("Unable to get a valid class FQN from 'ant.launcher.class' property, please set it accordingly");
throw new RuntimeException("Unable to get a valid class FQN from 'kotlin.ant.launcher.class' property, please set it accordingly");
}
runJava(