Fix project sync when intelliUltimateEnabled is not set

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
+4 -2
View File
@@ -12,7 +12,7 @@ val ideaProjectResources = project(":idea").the<JavaPluginConvention>().sourceS
evaluationDependsOn(":prepare:idea-plugin")
val intellijUltimateEnabled = true // : Boolean by rootProject.extra
val intellijUltimateEnabled : Boolean by rootProject.extra
val springClasspath by configurations.creating
@@ -197,7 +197,9 @@ projectTest {
dependsOn(preparePluginXml)
workingDir = rootDir
doFirst {
systemProperty("idea.home.path", intellijUltimateRootDir().canonicalPath)
if (intellijUltimateEnabled) {
systemProperty("idea.home.path", intellijUltimateRootDir().canonicalPath)
}
systemProperty("spring.classpath", springClasspath.asPath)
}
}
+28 -23
View File
@@ -1,6 +1,9 @@
import org.jetbrains.intellij.tasks.PrepareSandboxTask
import org.jetbrains.intellij.tasks.RunIdeTask
val intellijUltimateEnabled : Boolean by rootProject.extra
buildscript {
repositories {
maven(url = "https://oss.sonatype.org/content/repositories/snapshots/") // for intellij plugin
@@ -40,29 +43,31 @@ afterEvaluate {
destinationDir = File(buildDir, "sandbox-fake")
}
task<RunIdeTask>("runUltimate") {
dependsOn(":dist", ":prepare:idea-plugin:idea-plugin", ":ideaPlugin", ":ultimate:idea-ultimate-plugin")
dependsOn(prepareSandbox)
group = "intellij"
description = "Runs Intellij IDEA Ultimate with installed plugin."
setIdeaDirectory(intellijUltimateRootDir())
setConfigDirectory(File(ideaUltimateSandboxDir, "config"))
setSystemDirectory(ideaUltimateSandboxDir)
setPluginsDirectory(ideaUltimatePluginDir.parent)
jvmArgs(
"-Xmx1250m",
"-XX:ReservedCodeCacheSize=240m",
"-XX:+HeapDumpOnOutOfMemoryError",
"-ea",
"-Didea.is.internal=true",
"-Didea.debug.mode=true",
"-Dapple.laf.useScreenMenuBar=true",
"-Dapple.awt.graphics.UseQuartz=true",
"-Dsun.io.useCanonCaches=false",
"-Dkotlin.internal.mode.enabled=true"
)
if (project.hasProperty("noPCE")) {
jvmArgs("-Didea.ProcessCanceledException=disabled")
if (intellijUltimateEnabled) {
task<RunIdeTask>("runUltimate") {
dependsOn(":dist", ":prepare:idea-plugin:idea-plugin", ":ideaPlugin", ":ultimate:idea-ultimate-plugin")
dependsOn(prepareSandbox)
group = "intellij"
description = "Runs Intellij IDEA Ultimate with installed plugin."
setIdeaDirectory(intellijUltimateRootDir())
setConfigDirectory(File(ideaUltimateSandboxDir, "config"))
setSystemDirectory(ideaUltimateSandboxDir)
setPluginsDirectory(ideaUltimatePluginDir.parent)
jvmArgs(
"-Xmx1250m",
"-XX:ReservedCodeCacheSize=240m",
"-XX:+HeapDumpOnOutOfMemoryError",
"-ea",
"-Didea.is.internal=true",
"-Didea.debug.mode=true",
"-Dapple.laf.useScreenMenuBar=true",
"-Dapple.awt.graphics.UseQuartz=true",
"-Dsun.io.useCanonCaches=false",
"-Dkotlin.internal.mode.enabled=true"
)
if (project.hasProperty("noPCE")) {
jvmArgs("-Didea.ProcessCanceledException=disabled")
}
}
}
}