From c2b353bf1aa9fbd08ba250a0e42965c34464e94a Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 29 Mar 2017 17:55:30 +0300
Subject: [PATCH] build scripts: dbe_test_jars scripts reuses new code to
 compile the project

---
 .../intellij/build/CompilationContext.groovy  |  2 ++
 .../build/impl/BuildContextImpl.groovy        | 22 +++++--------------
 .../build/impl/CompilationContextImpl.groovy  | 15 +++++++++++++
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CompilationContext.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CompilationContext.groovy
index 534cee54595f..9076ea2f5ae3 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CompilationContext.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CompilationContext.groovy
@@ -35,4 +35,6 @@ interface CompilationContext {
   JpsModule findRequiredModule(String name)
 
   JpsModule findModule(String name)
+
+  void notifyArtifactBuilt(String artifactPath)
 }
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildContextImpl.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildContextImpl.groovy
index 3d6ee5cce10c..11887e4ff67c 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildContextImpl.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildContextImpl.groovy
@@ -16,7 +16,6 @@
 package org.jetbrains.intellij.build.impl
 
 import com.intellij.openapi.util.Pair
-import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.text.StringUtil
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
@@ -29,7 +28,6 @@ import org.jetbrains.jps.model.java.JavaSourceRootProperties
 import org.jetbrains.jps.model.module.JpsModule
 
 import java.util.function.BiFunction
-
 /**
  * @author nik
  */
@@ -146,6 +144,11 @@ class BuildContextImpl extends BuildContext {
     return compilationContext.findModule(name)
   }
 
+  @Override
+  void notifyArtifactBuilt(String artifactPath) {
+    compilationContext.notifyArtifactBuilt(artifactPath)
+  }
+
   @Override
   File findFileInModuleSources(String moduleName, String relativePath) {
     getSourceRootsWithPrefixes(findRequiredModule(moduleName)).collect {
@@ -264,19 +267,4 @@ class BuildContextImpl extends BuildContext {
     }
     return jvmArgs.trim()
   }
-
-  @Override
-  void notifyArtifactBuilt(String artifactPath) {
-    def file = new File(artifactPath)
-    def baseDir = new File(paths.projectHome)
-    if (!FileUtil.isAncestor(baseDir, file, true)) {
-      messages.warning("Artifact '$artifactPath' is not under '$paths.projectHome', it won't be reported")
-      return
-    }
-    def relativePath = FileUtil.toSystemIndependentName(FileUtil.getRelativePath(baseDir, file))
-    if (file.isDirectory()) {
-      relativePath += "=>" + file.name
-    }
-    messages.artifactBuild(relativePath)
-  }
 }
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
index 6e9fc68b11ad..0f04f1d87835 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
@@ -216,6 +216,21 @@ class CompilationContextImpl implements CompilationContext {
     project.modules.find { it.name == name }
   }
 
+  @Override
+  void notifyArtifactBuilt(String artifactPath) {
+    def file = new File(artifactPath)
+    def baseDir = new File(paths.projectHome)
+    if (!FileUtil.isAncestor(baseDir, file, true)) {
+      messages.warning("Artifact '$artifactPath' is not under '$paths.projectHome', it won't be reported")
+      return
+    }
+    def relativePath = FileUtil.toSystemIndependentName(FileUtil.getRelativePath(baseDir, file))
+    if (file.isDirectory()) {
+      relativePath += "=>" + file.name
+    }
+    messages.artifactBuild(relativePath)
+  }
+
   private static String toCanonicalPath(String communityHome) {
     FileUtil.toSystemIndependentName(new File(communityHome).canonicalPath)
   }