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: show proper error message if invalid module is specified

Browse Source 
...in ProductProperties or ScrambleTool.
This commit is contained in:
nik
2018-04-17 12:07:50 +03:00
parent 3577438f96
commit 31ebaff6c4
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
+11 -4
View File
@@ -124,7 +124,7 @@ class BuildTasksImpl extends BuildTasks {
String configPath = "$tempDir/config"
def ideClasspath = new LinkedHashSet<String>()
modules.collectMany(ideClasspath) { buildContext.getModuleRuntimeClasspath(buildContext.findModule(it), false) }
modules.collectMany(ideClasspath) { buildContext.getModuleRuntimeClasspath(buildContext.findRequiredModule(it), false) }
String classpathFile = "$tempDir/classpath.txt"
new File(classpathFile).text = ideClasspath.join("\n")
@@ -401,6 +401,10 @@ idea.fatal.error.notification=disabled
checkPaths([properties.yourkitAgentBinariesDirectoryPath], "productProperties.yourkitAgentBinariesDirectoryPath")
checkPaths(properties.additionalDirectoriesWithLicenses, "productProperties.additionalDirectoriesWithLicenses")
checkModules(properties.additionalModulesToCompile, "productProperties.additionalModulesToCompile")
checkModules(properties.modulesToCompileTests, "productProperties.modulesToCompileTests")
checkModules(properties.additionalModulesRequiredForScrambling, "productProperties.additionalModulesRequiredForScrambling")
def winCustomizer = buildContext.windowsDistributionCustomizer
checkPaths([winCustomizer?.icoPath], "productProperties.windowsCustomizer.icoPath")
checkPaths([winCustomizer?.installerImagesPath], "productProperties.windowsCustomizer.installerImagesPath")
@@ -417,6 +421,7 @@ idea.fatal.error.notification=disabled
}
checkModules(properties.mavenArtifacts.additionalModules, "productProperties.mavenArtifacts.additionalModules")
checkModules(buildContext.proprietaryBuildTools.scrambleTool?.namesOfModulesRequiredToBeScrambled, "ProprietaryBuildTools.scrambleTool.namesOfModulesRequiredToBeScrambled")
}
private void checkProductLayout() {
@@ -468,9 +473,11 @@ idea.fatal.error.notification=disabled
}
private void checkModules(Collection<String> modules, String fieldName) {
def unknownModules = modules.findAll {buildContext.findModule(it) == null}
if (!unknownModules.empty) {
buildContext.messages.error("The following modules from $fieldName aren't found in the project: $unknownModules")
if (modules != null) {
def unknownModules = modules.findAll {buildContext.findModule(it) == null}
if (!unknownModules.empty) {
buildContext.messages.error("The following modules from $fieldName aren't found in the project: $unknownModules")
}
}
}