From 2c4f508c27941bdb5d552cdb4db5314f982c9ced Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Tue, 5 Jul 2022 15:25:32 +0200 Subject: [PATCH] [fleet] generate licences for plugin dependencies (FL-11692) GitOrigin-RevId: 9b2a53debd247ad04b99d3f0c9d56d3337eeccac --- .gitignore | 3 ++- .../intellij/build/impl/LibraryLicensesListGenerator.kt | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5e640a6eff50..ab6e38c644f8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ edu/dependencies/.gradle edu/dependencies/build native/**/build/ stale_outputs_checked -/android \ No newline at end of file +/android +/tools/intellij.ide.starter \ No newline at end of file diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LibraryLicensesListGenerator.kt b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LibraryLicensesListGenerator.kt index a6e5b62c045f..5de68014b5ac 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LibraryLicensesListGenerator.kt +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LibraryLicensesListGenerator.kt @@ -18,9 +18,12 @@ import java.nio.file.Path class LibraryLicensesListGenerator(private val libraryLicenses: List) { companion object { - fun create(project: JpsProject, licensesList: List, usedModulesNames: Set): LibraryLicensesListGenerator { + fun create(project: JpsProject, + licensesList: List, + usedModulesNames: Set, + allowEmpty: Boolean = false): LibraryLicensesListGenerator { val licences = generateLicenses(project, licensesList, usedModulesNames) - check(!licences.isEmpty()) { + check(allowEmpty || !licences.isEmpty()) { "Empty licenses table for ${licensesList.size} licenses and ${usedModulesNames.size} used modules names" } return LibraryLicensesListGenerator(licences)