From df17f20ec7702c94662aa74271b11afc7c35d9d8 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 28 Dec 2017 15:35:04 +0100
Subject: [PATCH] Fix project sync when intelliUltimateEnabled is not set

---
 ultimate/build.gradle.kts                 |  6 ++-
 ultimate/ultimate-runner/build.gradle.kts | 51 +++++++++++++----------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index bc134b9f979..0b315c22271 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -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)
     }
 }
diff --git a/ultimate/ultimate-runner/build.gradle.kts b/ultimate/ultimate-runner/build.gradle.kts
index f9b5f129939..93da6148bbd 100644
--- a/ultimate/ultimate-runner/build.gradle.kts
+++ b/ultimate/ultimate-runner/build.gradle.kts
@@ -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")
+            }
         }
     }
 }