From 8861d8c409baf8a461dde7022bd7e189cb9bd39f Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Tue, 12 Sep 2017 13:47:58 +0300 Subject: [PATCH] Build scripts: do not build provided modules list for plugin-only builds --- .../intellij/build/impl/BuildTasksImpl.groovy | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy index 8af99b913996..ed6c6de72dc6 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy @@ -282,16 +282,17 @@ idea.fatal.error.notification=disabled compileModules(moduleNames, buildContext.productProperties.modulesToCompileTests) def productLayout = buildContext.productProperties.productLayout - - def providedModulesFilePath = "${buildContext.paths.artifacts}/${buildContext.productProperties.productCode}-builtinModules.json" - buildProvidedModulesList(providedModulesFilePath, productLayout.mainModules, productLayout.licenseFilesToBuildSearchableOptions) - def pluginsToPublish = distributionJARsBuilder.getPluginsByModules(buildContext.productProperties.productLayout.pluginModulesToPublish) - if (buildContext.productProperties.productLayout.buildAllCompatiblePlugins) { - if (!buildContext.options.buildStepsToSkip.contains(BuildOptions.PROVIDED_MODULES_LIST_STEP)) { - pluginsToPublish = new PluginsCollector(buildContext, providedModulesFilePath).collectCompatiblePluginsToPublish() - } - else { - buildContext.messages.info("Skipping collecting compatible plugins because PROVIDED_MODULES_LIST_STEP was skipped") + def pluginsToPublish = distributionJARsBuilder.getPluginsByModules(buildContext.productProperties.productLayout.pluginModulesToPublish) + if (buildContext.shouldBuildDistributions()) { + def providedModulesFilePath = "${buildContext.paths.artifacts}/${buildContext.productProperties.productCode}-builtinModules.json" + buildProvidedModulesList(providedModulesFilePath, productLayout.mainModules, productLayout.licenseFilesToBuildSearchableOptions) + if (buildContext.productProperties.productLayout.buildAllCompatiblePlugins) { + if (!buildContext.options.buildStepsToSkip.contains(BuildOptions.PROVIDED_MODULES_LIST_STEP)) { + pluginsToPublish = new PluginsCollector(buildContext, providedModulesFilePath).collectCompatiblePluginsToPublish() + } + else { + buildContext.messages.info("Skipping collecting compatible plugins because PROVIDED_MODULES_LIST_STEP was skipped") + } } } compileModules(pluginsToPublish.collect { it.moduleJars.values() }.flatten() as List)