From 90d7fd8de577b62aa1ebfe7b6461990f398aafcd Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 27 Jun 2018 14:13:14 +0300 Subject: [PATCH] build scripts: don't validate namesOfModulesRequiredToBeScrambled if scrambling won't be performed Build scripts for a non-commercial product may reuse ProprietaryBuildTools instance with scrambleTool, in that case build shouldn't fail if modules from namesOfModulesRequiredToBeScrambled don't exist in the project (IDEA-CR-33357). --- .../org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy | 4 +++- 1 file changed, 3 insertions(+), 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 5cee63dc8385..eb5c30a236be 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 @@ -423,7 +423,9 @@ idea.fatal.error.notification=disabled } checkModules(properties.mavenArtifacts.additionalModules, "productProperties.mavenArtifacts.additionalModules") - checkModules(buildContext.proprietaryBuildTools.scrambleTool?.namesOfModulesRequiredToBeScrambled, "ProprietaryBuildTools.scrambleTool.namesOfModulesRequiredToBeScrambled") + if (buildContext.productProperties.scrambleMainJar) { + checkModules(buildContext.proprietaryBuildTools.scrambleTool?.namesOfModulesRequiredToBeScrambled, "ProprietaryBuildTools.scrambleTool.namesOfModulesRequiredToBeScrambled") + } } private void checkProductLayout() {