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

Build scripts: builtin modules should contain only bundled plugins (IDEA-179418)

Browse Source 
- do not take modules from product's main_module and scramble-related modules
This commit is contained in:
Alexander Zolotov
2017-09-26 20:13:45 +03:00
parent 7138f11b5b
commit 402b649dcd
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
+8 -8
View File
@@ -274,18 +274,18 @@ idea.fatal.error.notification=disabled
}
private compileModulesForDistribution(DistributionJARsBuilder distributionJARsBuilder) {
def bundledPlugins = buildContext.productProperties.productLayout.bundledPluginModules as Set<String>
def moduleNames = buildContext.productProperties.productLayout.getIncludedPluginModules(bundledPlugins) +
distributionJARsBuilder.platformModules +
buildContext.productProperties.additionalModulesToCompile +
(buildContext.proprietaryBuildTools.scrambleTool?.additionalModulesToCompile ?: [])
compileModules(moduleNames, buildContext.productProperties.modulesToCompileTests)
def productLayout = buildContext.productProperties.productLayout
def bundledPlugins = productLayout.bundledPluginModules as Set<String>
def moduleNames = productLayout.getIncludedPluginModules(bundledPlugins) +
distributionJARsBuilder.platformModules +
buildContext.productProperties.additionalModulesToCompile
compileModules(moduleNames + (buildContext.proprietaryBuildTools.scrambleTool?.additionalModulesToCompile ?: []) +
productLayout.mainModules, buildContext.productProperties.modulesToCompileTests)
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)
buildProvidedModulesList(providedModulesFilePath, moduleNames, productLayout.licenseFilesToBuildSearchableOptions)
if (buildContext.productProperties.productLayout.buildAllCompatiblePlugins) {
if (!buildContext.options.buildStepsToSkip.contains(BuildOptions.PROVIDED_MODULES_LIST_STEP)) {
pluginsToPublish = new PluginsCollector(buildContext, providedModulesFilePath).collectCompatiblePluginsToPublish()
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
+1 -3
View File
@@ -145,9 +145,7 @@ class DistributionJARsBuilder {
List<String> getPlatformModules() {
(platform.moduleJars.values() as List<String>) +
["java-runtime", "platform-main", /*required to build searchable options index*/
"updater"] + buildContext.productProperties.productLayout.mainModules
["java-runtime", "platform-main", /*required to build searchable options index*/ "updater"]
}
void buildJARs() {