MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert: build scripts: create AntBuilder's instance instead of getting it from GantBinding

Browse Source 
Otherwise TeamCity cannot track tests execution.
This commit is contained in:
nik
2017-07-08 15:53:34 +03:00
parent 87d93f9488
commit 64f307cadf
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildContext.groovy
+7 -7
View File
@@ -86,20 +86,20 @@ abstract class BuildContext implements CompilationContext {
abstract boolean shouldBuildDistributionForOS(String os)
static BuildContext createContext(String communityHome, String projectHome, ProductProperties productProperties,
static BuildContext createContext(AntBuilder ant, String communityHome, String projectHome, ProductProperties productProperties,
ProprietaryBuildTools proprietaryBuildTools = ProprietaryBuildTools.DUMMY,
BuildOptions options = new BuildOptions()) {
return BuildContextImpl.create(communityHome, projectHome, productProperties, proprietaryBuildTools, options)
return BuildContextImpl.create(ant, communityHome, projectHome, productProperties, proprietaryBuildTools, options)
}
/**
* @deprecated use {@link #createContext(String, String, ProductProperties, ProprietaryBuildTools, BuildOptions)} instead
* @deprecated use {@link #createContext(AntBuilder, String, String, ProductProperties, ProprietaryBuildTools, BuildOptions)} instead
*/
static BuildContext createContext(AntBuilder ant, JpsGantProjectBuilder projectBuilder, JpsProject project, JpsGlobal global,
String communityHome, String projectHome, ProductProperties productProperties,
ProprietaryBuildTools proprietaryBuildTools = ProprietaryBuildTools.DUMMY,
BuildOptions options = new BuildOptions()) {
return BuildContextImpl.create(communityHome, projectHome, productProperties, proprietaryBuildTools, options)
String communityHome, String projectHome, ProductProperties productProperties,
ProprietaryBuildTools proprietaryBuildTools = ProprietaryBuildTools.DUMMY,
BuildOptions options = new BuildOptions()) {
return BuildContextImpl.create(ant, communityHome, projectHome, productProperties, proprietaryBuildTools, options)
}
/**
platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildTasks.groovy
+1 -1
View File
@@ -90,7 +90,7 @@ abstract class BuildTasks {
BuildUtils.addToClassPath("$projectHome/$it", binding.ant)
}
ProductProperties productProperties = (ProductProperties) Class.forName(productPropertiesClassName).constructors[0].newInstance(projectHome)
BuildContext context = BuildContext.createContext("$projectHome/$communityHomeRelativePath", projectHome,
BuildContext context = BuildContext.createContext(binding.ant, "$projectHome/$communityHomeRelativePath", projectHome,
productProperties, proprietaryBuildTools)
return context
}
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildContextImpl.groovy
+2 -2
View File
@@ -37,13 +37,13 @@ class BuildContextImpl extends BuildContext {
private final JpsGlobal global
private final CompilationContextImpl compilationContext
static BuildContextImpl create(String communityHome, String projectHome, ProductProperties productProperties,
static BuildContextImpl create(AntBuilder ant, String communityHome, String projectHome, ProductProperties productProperties,
ProprietaryBuildTools proprietaryBuildTools, BuildOptions options) {
WindowsDistributionCustomizer windowsDistributionCustomizer = productProperties.createWindowsCustomizer(projectHome)
LinuxDistributionCustomizer linuxDistributionCustomizer = productProperties.createLinuxCustomizer(projectHome)
MacDistributionCustomizer macDistributionCustomizer = productProperties.createMacCustomizer(projectHome)
def compilationContext = CompilationContextImpl.create(communityHome, projectHome,
def compilationContext = CompilationContextImpl.create(ant, communityHome, projectHome,
createBuildOutputRootEvaluator(projectHome, productProperties), options)
def context = new BuildContextImpl(compilationContext, productProperties,
windowsDistributionCustomizer, linuxDistributionCustomizer, macDistributionCustomizer,
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
+6 -5
View File
@@ -18,6 +18,7 @@ package org.jetbrains.intellij.build.impl
import com.intellij.openapi.util.io.FileUtil
import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import org.codehaus.gant.GantBinding
import org.jetbrains.intellij.build.*
import org.jetbrains.jps.gant.JpsGantProjectBuilder
import org.jetbrains.jps.model.JpsElementFactory
@@ -51,15 +52,15 @@ class CompilationContextImpl implements CompilationContext {
@SuppressWarnings("GrUnresolvedAccess")
@CompileDynamic
static CompilationContextImpl create(String communityHome, String projectHome, String defaultOutputRoot) {
static CompilationContextImpl create(String communityHome, String projectHome, String defaultOutputRoot, Script gantScript) {
GantBinding binding = (GantBinding) gantScript.binding
//noinspection GroovyAssignabilityCheck
return create(communityHome, projectHome,
{ p, m -> defaultOutputRoot } as BiFunction<JpsProject, BuildMessages, String>, new BuildOptions())
return create(binding.ant, communityHome, projectHome,
{ p, m -> defaultOutputRoot } as BiFunction<JpsProject, BuildMessages, String>, new BuildOptions())
}
static CompilationContextImpl create(String communityHome, String projectHome,
static CompilationContextImpl create(AntBuilder ant, String communityHome, String projectHome,
BiFunction<JpsProject, BuildMessages, String> buildOutputRootEvaluator, BuildOptions options) {
AntBuilder ant = new AntBuilder()
def messages = BuildMessagesImpl.create(ant.project)
communityHome = toCanonicalPath(communityHome)
if (["platform/build-scripts", "bin/log.xml", "build.txt"].any { !new File(communityHome, it).exists() }) {
python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginBuilder.groovy
+2 -1
View File
@@ -36,7 +36,8 @@ class PythonCommunityPluginBuilder {
def build() {
def pluginBuildNumber = System.getProperty("build.number", "SNAPSHOT")
def options = new BuildOptions(targetOS: BuildOptions.OS_NONE, buildNumber: pluginBuildNumber, outputRootPath: "$home/out/pycharmCE")
def buildContext = BuildContext.createContext(home, home, new PythonCommunityPluginProperties(), ProprietaryBuildTools.DUMMY, options)
def buildContext = BuildContext.createContext(binding.ant, home, home, new PythonCommunityPluginProperties(),
ProprietaryBuildTools.DUMMY, options)
def buildTasks = BuildTasks.create(buildContext)
buildTasks.buildDistributions()
def pluginsPaths = new File("$buildContext.paths.buildOutputRoot/plugins-paths.txt")