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: handle module rename

Browse Source 
Properly support cases when several modules are packed into a jar which name corresponds to name of one of these modules.
This commit is contained in:
nik
2018-01-23 13:26:07 +03:00
parent ccb7b88046
commit 3be1f18c51
1 changed files with 10 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/DistributionJARsBuilder.groovy
+10 -4
View File
@@ -403,11 +403,17 @@ class DistributionJARsBuilder {
def resourcesIncluded = RESOURCES_INCLUDED
def buildContext = buildContext
checkModuleExcludes(layout.moduleExcludes)
MultiValuesMap<String, String> actualModuleJars = new MultiValuesMap<>(true)
moduleJars.entrySet().each {
def modules = it.value
def jarPath = getActualModuleJarPath(it.key, modules)
actualModuleJars.putAll(jarPath, modules)
}
layoutBuilder.layout(targetDirectory) {
dir("lib") {
moduleJars.entrySet().each {
actualModuleJars.entrySet().each {
def modules = it.value
def jarPath = getActualModuleJarPath(it.key, modules)
def jarPath = it.key
jar(jarPath, true) {
modules.each { moduleName ->
modulePatches([moduleName]) {
@@ -433,7 +439,7 @@ class DistributionJARsBuilder {
}
}
def outputResourceJars = new MultiValuesMap<String, String>()
moduleJars.values().forEach {
actualModuleJars.values().forEach {
def resourcesJarName = layout.localizableResourcesJarName(it)
if (resourcesJarName != null) {
outputResourceJars.put(resourcesJarName, it)
@@ -469,7 +475,7 @@ class DistributionJARsBuilder {
}
//include all module libraries from the plugin modules added to IDE classpath to layout
moduleJars.entrySet().findAll { !it.key.contains("/") }.collectMany { it.value }
actualModuleJars.entrySet().findAll { !it.key.contains("/") }.collectMany { it.value }
.findAll {!layout.modulesWithExcludedModuleLibraries.contains(it)}.each { moduleName ->
findModule(moduleName).dependenciesList.dependencies.
findAll { it instanceof JpsLibraryDependency && it?.libraryReference?.parentReference?.resolve() instanceof JpsModule }.