diff --git a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityBuilder.groovy index 8a629469c069..24dea4af9201 100644 --- a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityBuilder.groovy @@ -14,19 +14,17 @@ * limitations under the License. */ package org.jetbrains.intellij.build - -import org.codehaus.gant.GantBinding /** * @author nik */ class IdeaCommunityBuilder { private final BuildContext buildContext - IdeaCommunityBuilder(String home, GantBinding binding, BuildOptions options = new BuildOptions(), String projectHome = home) { + IdeaCommunityBuilder(String home, BuildOptions options = new BuildOptions(), String projectHome = home) { buildContext = BuildContext.createContext(home, projectHome, new IdeaCommunityProperties(home), ProprietaryBuildTools.DUMMY, options) } - IdeaCommunityBuilder(GantBinding binding, BuildContext buildContext) { + IdeaCommunityBuilder(BuildContext buildContext) { this.buildContext = buildContext } diff --git a/build/scripts/idea_community.gant b/build/scripts/idea_community.gant index 263991683cab..996a4114d12e 100644 --- a/build/scripts/idea_community.gant +++ b/build/scripts/idea_community.gant @@ -20,18 +20,18 @@ import org.jetbrains.jps.idea.IdeaProjectLoader String home = IdeaProjectLoader.guessHome(this) target(compile: "Compile project") { - new IdeaCommunityBuilder(home, binding).compileModules() + new IdeaCommunityBuilder(home).compileModules() } target('default': 'The default target') { def options = new BuildOptions() options.buildNumber = null //we cannot provide consistent build number for IDEA Community if it's built separately so use *.SNAPSHOT number to avoid confusion - new IdeaCommunityBuilder(home, binding, options).buildDistributions() + new IdeaCommunityBuilder(home, options).buildDistributions() } target('build-intellij-core' : 'Build intellij-core.zip') { def options = new BuildOptions() - new IdeaCommunityBuilder(home, binding, options).buildIntelliJCore() + new IdeaCommunityBuilder(home, options).buildIntelliJCore() } target('update-from-sources': 'Update locally installed distribution from compiled classes') { @@ -42,7 +42,7 @@ target('update-from-sources': 'Update locally installed distribution from compil options.buildStepsToSkip << BuildOptions.SOURCES_ARCHIVE_STEP //when IDEA CE is updated from IDEA UE sources project should be loaded from IDEA UE directory String projectHome = isDefined("devIdeaHome") ? devIdeaHome : home - new IdeaCommunityBuilder(home, binding, options, projectHome).buildUnpackedDistribution(deploy) + new IdeaCommunityBuilder(home, options, projectHome).buildUnpackedDistribution(deploy) } private boolean isDefined(String key) { diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginBuilder.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginBuilder.groovy index 0bc5e94ce973..b70c92f85a1a 100644 --- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginBuilder.groovy +++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginBuilder.groovy @@ -15,7 +15,6 @@ */ package org.jetbrains.intellij.build.pycharm -import org.codehaus.gant.GantBinding import org.jetbrains.intellij.build.BuildContext import org.jetbrains.intellij.build.BuildOptions import org.jetbrains.intellij.build.BuildTasks @@ -25,12 +24,10 @@ import org.jetbrains.intellij.build.ProprietaryBuildTools * @author vlan */ class PythonCommunityPluginBuilder { - private final GantBinding binding private final String home - PythonCommunityPluginBuilder(String home, GantBinding binding) { + PythonCommunityPluginBuilder(String home) { this.home = home - this.binding = binding } def build() { diff --git a/python/build/python_community_plugin_build.gant b/python/build/python_community_plugin_build.gant index 7065c91b153a..510e139acfd2 100644 --- a/python/build/python_community_plugin_build.gant +++ b/python/build/python_community_plugin_build.gant @@ -5,5 +5,5 @@ target("default": "Default") { String home = new File(IdeaProjectLoader.guessHome(this)).absolutePath BuildUtils.addToClassPath("$home/build/groovy", ant) BuildUtils.addToClassPath("$home/python/build/groovy", ant) - Class.forName("org.jetbrains.intellij.build.pycharm.PythonCommunityPluginBuilder").constructors[0].newInstance(home, binding).build() + Class.forName("org.jetbrains.intellij.build.pycharm.PythonCommunityPluginBuilder").constructors[0].newInstance(home).build() }