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

Fix project sync when intelliUltimateEnabled is not set

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-12-28 15:35:04 +01:00
committed by Vyacheslav Gerasimov
parent a58a6290cc
commit df17f20ec7
2 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ultimate/build.gradle.kts
+4 -2
View File
@@ -12,7 +12,7 @@ val ideaProjectResources = project(":idea").the<JavaPluginConvention>().sourceS
evaluationDependsOn(":prepare:idea-plugin") evaluationDependsOn(":prepare:idea-plugin")
val intellijUltimateEnabled = true // : Boolean by rootProject.extra val intellijUltimateEnabled : Boolean by rootProject.extra
val springClasspath by configurations.creating val springClasspath by configurations.creating
@@ -197,7 +197,9 @@ projectTest {
dependsOn(preparePluginXml) dependsOn(preparePluginXml)
workingDir = rootDir workingDir = rootDir
doFirst { doFirst {
systemProperty("idea.home.path", intellijUltimateRootDir().canonicalPath) if (intellijUltimateEnabled) {
systemProperty("idea.home.path", intellijUltimateRootDir().canonicalPath)
}
systemProperty("spring.classpath", springClasspath.asPath) systemProperty("spring.classpath", springClasspath.asPath)
} }
} }
ultimate/ultimate-runner/build.gradle.kts
+28 -23
View File
@@ -1,6 +1,9 @@
import org.jetbrains.intellij.tasks.PrepareSandboxTask import org.jetbrains.intellij.tasks.PrepareSandboxTask
import org.jetbrains.intellij.tasks.RunIdeTask import org.jetbrains.intellij.tasks.RunIdeTask
val intellijUltimateEnabled : Boolean by rootProject.extra
buildscript { buildscript {
repositories { repositories {
maven(url = "https://oss.sonatype.org/content/repositories/snapshots/") // for intellij plugin maven(url = "https://oss.sonatype.org/content/repositories/snapshots/") // for intellij plugin
@@ -40,29 +43,31 @@ afterEvaluate {
destinationDir = File(buildDir, "sandbox-fake") destinationDir = File(buildDir, "sandbox-fake")
} }
task<RunIdeTask>("runUltimate") { if (intellijUltimateEnabled) {
dependsOn(":dist", ":prepare:idea-plugin:idea-plugin", ":ideaPlugin", ":ultimate:idea-ultimate-plugin") task<RunIdeTask>("runUltimate") {
dependsOn(prepareSandbox) dependsOn(":dist", ":prepare:idea-plugin:idea-plugin", ":ideaPlugin", ":ultimate:idea-ultimate-plugin")
group = "intellij" dependsOn(prepareSandbox)
description = "Runs Intellij IDEA Ultimate with installed plugin." group = "intellij"
setIdeaDirectory(intellijUltimateRootDir()) description = "Runs Intellij IDEA Ultimate with installed plugin."
setConfigDirectory(File(ideaUltimateSandboxDir, "config")) setIdeaDirectory(intellijUltimateRootDir())
setSystemDirectory(ideaUltimateSandboxDir) setConfigDirectory(File(ideaUltimateSandboxDir, "config"))
setPluginsDirectory(ideaUltimatePluginDir.parent) setSystemDirectory(ideaUltimateSandboxDir)
jvmArgs( setPluginsDirectory(ideaUltimatePluginDir.parent)
"-Xmx1250m", jvmArgs(
"-XX:ReservedCodeCacheSize=240m", "-Xmx1250m",
"-XX:+HeapDumpOnOutOfMemoryError", "-XX:ReservedCodeCacheSize=240m",
"-ea", "-XX:+HeapDumpOnOutOfMemoryError",
"-Didea.is.internal=true", "-ea",
"-Didea.debug.mode=true", "-Didea.is.internal=true",
"-Dapple.laf.useScreenMenuBar=true", "-Didea.debug.mode=true",
"-Dapple.awt.graphics.UseQuartz=true", "-Dapple.laf.useScreenMenuBar=true",
"-Dsun.io.useCanonCaches=false", "-Dapple.awt.graphics.UseQuartz=true",
"-Dkotlin.internal.mode.enabled=true" "-Dsun.io.useCanonCaches=false",
) "-Dkotlin.internal.mode.enabled=true"
if (project.hasProperty("noPCE")) { )
jvmArgs("-Didea.ProcessCanceledException=disabled") if (project.hasProperty("noPCE")) {
jvmArgs("-Didea.ProcessCanceledException=disabled")
}
} }
} }
} }