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

Pill: Fix platform home directory (this fixes IDE tests)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-03-06 00:22:52 +03:00
parent d1a4acb81f
commit 799c0f28b7
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/intellijDependencies.kt
+5 -2
View File
@@ -83,6 +83,10 @@ object IntellijRootUtils {
fun getRepositoryRootDir(project: Project): File = with (project.rootProject) { fun getRepositoryRootDir(project: Project): File = with (project.rootProject) {
return File(intellijRepoDir(), "kotlin.build.custom.deps/${extra["versions.intellijSdk"]}") return File(intellijRepoDir(), "kotlin.build.custom.deps/${extra["versions.intellijSdk"]}")
} }
fun getIntellijRootDir(project: Project): File = with (project.rootProject) {
return File(getRepositoryRootDir(this), "intellij${if (isIntellijCommunityAvailable()) "" else "Ultimate"}")
}
} }
fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project) = fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project) =
@@ -95,8 +99,7 @@ fun Project.isIntellijCommunityAvailable() = !(rootProject.extra["intellijUltima
fun Project.isIntellijUltimateSdkAvailable() = (rootProject.extra["intellijUltimateEnabled"] as Boolean) fun Project.isIntellijUltimateSdkAvailable() = (rootProject.extra["intellijUltimateEnabled"] as Boolean)
fun Project.intellijRootDir() = fun Project.intellijRootDir() = IntellijRootUtils.getIntellijRootDir(project)
File(IntellijRootUtils.getRepositoryRootDir(this), "intellij${if (isIntellijCommunityAvailable()) "" else "Ultimate"}")
fun Project.intellijUltimateRootDir() = fun Project.intellijUltimateRootDir() =
if (isIntellijUltimateSdkAvailable()) if (isIntellijUltimateSdkAvailable())
buildSrc/src/main/kotlin/pill/plugin.kt
+4 -4
View File
@@ -88,7 +88,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
platformVersion = project.extensions.extraProperties.get("versions.intellijSdk").toString() platformVersion = project.extensions.extraProperties.get("versions.intellijSdk").toString()
platformBaseNumber = platformVersion.substringBefore(".", "").takeIf { it.isNotEmpty() } platformBaseNumber = platformVersion.substringBefore(".", "").takeIf { it.isNotEmpty() }
?: error("Invalid platform version: $platformVersion") ?: error("Invalid platform version: $platformVersion")
platformDir = IntellijRootUtils.getRepositoryRootDir(project) platformDir = IntellijRootUtils.getIntellijRootDir(project)
} }
private fun pill(rootProject: Project) { private fun pill(rootProject: Project) {
@@ -216,7 +216,7 @@ class JpsCompatiblePlugin : Plugin<Project> {
} }
private fun attachPlatformSources(library: PLibrary): PLibrary { private fun attachPlatformSources(library: PLibrary): PLibrary {
val platformSourcesJar = File(platformDir, "sources/ideaIC-$platformVersion-sources.jar") val platformSourcesJar = File(platformDir, "../sources/ideaIC-$platformVersion-sources.jar")
if (library.classes.any { it.startsWith(platformDir) }) { if (library.classes.any { it.startsWith(platformDir) }) {
return library.attachSource(platformSourcesJar) return library.attachSource(platformSourcesJar)
@@ -226,8 +226,8 @@ class JpsCompatiblePlugin : Plugin<Project> {
} }
private fun attachAsmSources(library: PLibrary): PLibrary { private fun attachAsmSources(library: PLibrary): PLibrary {
val asmSourcesJar = File(platformDir, "asm-shaded-sources/asm-src-$platformBaseNumber.jar") val asmSourcesJar = File(platformDir, "../asm-shaded-sources/asm-src-$platformBaseNumber.jar")
val asmAllJar = File(platformDir, "intellij/lib/asm-all.jar") val asmAllJar = File(platformDir, "lib/asm-all.jar")
if (library.classes.any { it == asmAllJar }) { if (library.classes.any { it == asmAllJar }) {
return library.attachSource(asmSourcesJar) return library.attachSource(asmSourcesJar)