From af556338432df296f4b2fc564c9fd03e9718604d Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 14 Mar 2017 12:31:17 +0300 Subject: [PATCH] build scripts: don't report error if an optional module from a plugin layout is missing --- .../org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5de2d6caa060..6051f8cc7767 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 @@ -364,7 +364,7 @@ idea.fatal.error.notification=disabled checkModules(layout.pluginModulesWithRestrictedCompatibleBuildRange, "productProperties.productLayout.pluginModulesWithRestrictedCompatibleBuildRange") checkProjectLibraries(layout.projectLibrariesToUnpackIntoMainJar, "productProperties.productLayout.projectLibrariesToUnpackIntoMainJar") nonTrivialPlugins.findAll {layout.enabledPluginModules.contains(it.mainModule)}.each { plugin -> - checkModules(plugin.moduleJars.values(), "'$plugin.mainModule' plugin") + checkModules(plugin.moduleJars.values() - plugin.optionalModules, "'$plugin.mainModule' plugin") checkModules(plugin.moduleExcludes.keySet(), "'$plugin.mainModule' plugin") checkProjectLibraries(plugin.includedProjectLibraries, "'$plugin.mainModule' plugin") }