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

Don't search in random directories for existent libraries

Browse Source 
#KT-4644 In Progress
This commit is contained in:
Nikolay Krasko
2014-03-18 14:43:29 +04:00
parent 3911a6f54b
commit 5362b81ea5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdDescription.java
+2 -2
View File
@@ -89,8 +89,8 @@ public class JSLibraryStdDescription extends CustomLibraryDescriptorWithDefferCo
String defaultPathToJarFileDir = String defaultPathToJarFileDir =
useRelativePaths ? DEFAULT_LIB_DIR_NAME : createRelativePath(null, contextDirectory, DEFAULT_LIB_DIR_NAME); useRelativePaths ? DEFAULT_LIB_DIR_NAME : createRelativePath(null, contextDirectory, DEFAULT_LIB_DIR_NAME);
boolean jsFilePresent = isJsFilePresent(defaultPathToJsFileDir); boolean jsFilePresent = !useRelativePaths && isJsFilePresent(defaultPathToJsFileDir);
boolean jarFilePresent = getFileInDir(jsConfigurator.getJarName(), defaultPathToJarFileDir).exists(); boolean jarFilePresent = !useRelativePaths && getFileInDir(jsConfigurator.getJarName(), defaultPathToJarFileDir).exists();
if (jarFilePresent && jsFilePresent) { if (jarFilePresent && jsFilePresent) {
return createConfiguration(getFileInDir(jsConfigurator.getJarName(), defaultPathToJarFileDir)); return createConfiguration(getFileInDir(jsConfigurator.getJarName(), defaultPathToJarFileDir));
idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescriptorWithDe
File librarySrcFile; File librarySrcFile;
File stdJarInDefaultPath = getFileInDir(jvmConfigurator.getJarName(), defaultPathToJarFile); File stdJarInDefaultPath = getFileInDir(jvmConfigurator.getJarName(), defaultPathToJarFile);
if (stdJarInDefaultPath.exists()) { if (!useRelativePaths && stdJarInDefaultPath.exists()) {
libraryFile = stdJarInDefaultPath; libraryFile = stdJarInDefaultPath;
File sourcesJar = getFileInDir(jvmConfigurator.getSourcesJarName(), defaultPathToJarFile); File sourcesJar = getFileInDir(jvmConfigurator.getSourcesJarName(), defaultPathToJarFile);