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

Copy libraries to {project.dir}/lib folder by default (KT-8231)

Browse Source 
#KT-8231 Fixed
This commit is contained in:
Nikolay Krasko
2015-06-24 21:26:09 +03:00
parent a98468e829
commit d937f385cd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java
+5 -5
View File
@@ -57,7 +57,7 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi
private final String modulesSeparatorCaption; private final String modulesSeparatorCaption;
private final LibraryKind libraryKind; private final LibraryKind libraryKind;
private final Set<? extends LibraryKind> suitableLibraryKinds; private final Set<? extends LibraryKind> suitableLibraryKinds;
private final boolean useRelativePaths; private final VirtualFile projectBaseDir;
private DeferredCopyFileRequests deferredCopyFileRequests; private DeferredCopyFileRequests deferredCopyFileRequests;
@@ -73,7 +73,7 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi
@NotNull LibraryKind libraryKind, @NotNull LibraryKind libraryKind,
@NotNull Set<? extends LibraryKind> suitableLibraryKinds @NotNull Set<? extends LibraryKind> suitableLibraryKinds
) { ) {
useRelativePaths = project == null; this.projectBaseDir = project != null ? project.getBaseDir() : null;
this.configuratorName = configuratorName; this.configuratorName = configuratorName;
this.libraryName = libraryName; this.libraryName = libraryName;
this.dialogTitle = dialogTitle; this.dialogTitle = dialogTitle;
@@ -168,8 +168,8 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi
deferredCopyFileRequests = new DeferredCopyFileRequests(configurator); deferredCopyFileRequests = new DeferredCopyFileRequests(configurator);
String defaultPathToJarFile = useRelativePaths ? DEFAULT_LIB_DIR_NAME String defaultPathToJarFile = projectBaseDir == null ? DEFAULT_LIB_DIR_NAME
: FileUIUtils.createRelativePath(null, contextDirectory, DEFAULT_LIB_DIR_NAME); : FileUIUtils.createRelativePath(null, projectBaseDir, DEFAULT_LIB_DIR_NAME);
RuntimeLibraryFiles files = configurator.getExistingJarFiles(); RuntimeLibraryFiles files = configurator.getExistingJarFiles();
@@ -178,7 +178,7 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi
File runtimeSrcJar; File runtimeSrcJar;
File stdJarInDefaultPath = files.getRuntimeDestination(defaultPathToJarFile); File stdJarInDefaultPath = files.getRuntimeDestination(defaultPathToJarFile);
if (!useRelativePaths && stdJarInDefaultPath.exists()) { if (projectBaseDir != null && stdJarInDefaultPath.exists()) {
runtimeJar = stdJarInDefaultPath; runtimeJar = stdJarInDefaultPath;
reflectJar = files.getReflectDestination(defaultPathToJarFile); reflectJar = files.getReflectDestination(defaultPathToJarFile);