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

Fix generateIdeaGradleFiles on Windows

Browse Source
This commit is contained in:
Nikolay Krasko
2021-06-17 00:48:31 +03:00
committed by TeamCityServer
parent 8c69913640
commit 71ee9cf1be
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/ide-iml-to-gradle-generator/src/org/jetbrains/kotlin/generators/imltogradle/Main.kt
+7 -3
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.generators.imltogradle package org.jetbrains.kotlin.generators.imltogradle
import com.google.gson.JsonParser import com.google.gson.JsonParser
import com.intellij.openapi.util.io.systemIndependentPath
import org.jetbrains.jps.model.JpsSimpleElement import org.jetbrains.jps.model.JpsSimpleElement
import org.jetbrains.jps.model.java.JavaResourceRootType import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType import org.jetbrains.jps.model.java.JavaSourceRootType
@@ -103,7 +104,10 @@ fun convertJpsLibrary(lib: JpsLibrary, scope: JpsJavaDependencyScope, exported:
return when { return when {
mavenRepositoryLibraryDescriptor == null -> { mavenRepositoryLibraryDescriptor == null -> {
lib.getRootUrls(JpsOrderRootType.COMPILED) lib.getRootUrls(JpsOrderRootType.COMPILED)
.map { it.removePrefix("jar://").removeSuffix("!/").removePrefix(KOTLIN_REPO_ROOT.canonicalPath) } .map {
it.removePrefix("jar://").removeSuffix("!/")
.removePrefix(KOTLIN_REPO_ROOT.canonicalPath.replace("\\", "/"))
}
.map { .map {
check(it.startsWith("/kotlin-ide/intellij/")) { "Only jars from Community repo are accepted $it" } check(it.startsWith("/kotlin-ide/intellij/")) { "Only jars from Community repo are accepted $it" }
val relativeToCommunity = it.removePrefix("/kotlin-ide/intellij/").removePrefix("community/") val relativeToCommunity = it.removePrefix("/kotlin-ide/intellij/").removePrefix("community/")
@@ -188,8 +192,8 @@ fun convertJpsDependencyElement(dep: JpsDependencyElement): List<JpsLikeDependen
fun convertJpsModuleSourceRoot(imlFile: File, sourceRoot: JpsModuleSourceRoot): String { fun convertJpsModuleSourceRoot(imlFile: File, sourceRoot: JpsModuleSourceRoot): String {
return when (sourceRoot.rootType) { return when (sourceRoot.rootType) {
is JavaSourceRootType -> "java.srcDir(\"${sourceRoot.file.relativeTo(imlFile.parentFile)}\")" is JavaSourceRootType -> "java.srcDir(\"${sourceRoot.file.relativeTo(imlFile.parentFile).systemIndependentPath}\")"
is JavaResourceRootType -> "resources.srcDir(\"${sourceRoot.file.relativeTo(imlFile.parentFile)}\")" is JavaResourceRootType -> "resources.srcDir(\"${sourceRoot.file.relativeTo(imlFile.parentFile).systemIndependentPath}\")"
else -> error("Unknown sourceRoot = $sourceRoot") else -> error("Unknown sourceRoot = $sourceRoot")
} }
} }