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

JS backend: JpsJsModuleUtils: remove filtering for Kotlin Javascript libraries

Browse Source 
Original commit: f5d957445f
This commit is contained in:
Michael Nedzelsky
2014-10-24 12:47:11 +04:00
parent ff87c72274
commit e6356c239b
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java
+1 -7
View File
@@ -18,7 +18,6 @@ package org.jetbrains.jet.jps.build;
import com.intellij.util.Consumer; import com.intellij.util.Consumer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.utils.LibraryUtils;
import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.ModuleBuildTarget;
import org.jetbrains.jps.model.java.JavaSourceRootType; import org.jetbrains.jps.model.java.JavaSourceRootType;
import org.jetbrains.jps.model.java.JpsJavaModuleType; import org.jetbrains.jps.model.java.JpsJavaModuleType;
@@ -29,7 +28,6 @@ import org.jetbrains.jps.model.module.JpsModule;
import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import org.jetbrains.jps.model.module.JpsModuleSourceRoot;
import org.jetbrains.jps.util.JpsPathUtil; import org.jetbrains.jps.util.JpsPathUtil;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -49,11 +47,7 @@ class JpsJsModuleUtils {
Set<JpsLibrary> libraries = JpsUtils.getAllDependencies(target).getLibraries(); Set<JpsLibrary> libraries = JpsUtils.getAllDependencies(target).getLibraries();
for (JpsLibrary library : libraries) { for (JpsLibrary library : libraries) {
for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) {
String path = JpsPathUtil.urlToPath(root.getUrl()); result.add(JpsPathUtil.urlToPath(root.getUrl()));
// TODO: Do we need to add to dependency all libraries?
if (LibraryUtils.isJsRuntimeLibrary(new File(path))) {
result.add(path);
}
} }
} }
} }