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

in order to avoid misleading suggestions to run 'ant dist', calculate the paths to SDK annotations relatively to the home directory

Browse Source
This commit is contained in:
Dmitry Jemerov
2014-12-08 12:53:40 +01:00
committed by Evgeny Gerashchenko
parent a94f7f10b0
commit f31ea8bd0e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetTestUtils.java
+2 -2
View File
@@ -298,7 +298,7 @@ public class JetTestUtils {
@NotNull @NotNull
public static File getJdkAnnotationsJar() { public static File getJdkAnnotationsJar() {
File jdkAnnotations = new File("dependencies/annotations/kotlin-jdk-annotations.jar"); File jdkAnnotations = new File(JetTestCaseBuilder.getHomeDirectory(), "dependencies/annotations/kotlin-jdk-annotations.jar");
if (!jdkAnnotations.exists()) { if (!jdkAnnotations.exists()) {
throw new RuntimeException("Kotlin JDK annotations jar not found; please run 'ant dist' to build it"); throw new RuntimeException("Kotlin JDK annotations jar not found; please run 'ant dist' to build it");
} }
@@ -307,7 +307,7 @@ public class JetTestUtils {
@NotNull @NotNull
public static File getAndroidSdkAnnotationsJar() { public static File getAndroidSdkAnnotationsJar() {
File androidSdkAnnotations = new File("dependencies/annotations/kotlin-android-sdk-annotations.jar"); File androidSdkAnnotations = new File(JetTestCaseBuilder.getHomeDirectory(), "dependencies/annotations/kotlin-android-sdk-annotations.jar");
if (!androidSdkAnnotations.exists()) { if (!androidSdkAnnotations.exists()) {
throw new RuntimeException("Kotlin Android SDK annotations jar not found; please run 'ant dist' to build it"); throw new RuntimeException("Kotlin Android SDK annotations jar not found; please run 'ant dist' to build it");
} }