Compare commits

..

1 Commits

Author SHA1 Message Date
Ulysse Gressé-Lugué
c7a0c75dca
Merge 5a15cc1035 into 03dac9ed6d 2024-10-23 14:00:13 -03:00

View File

@ -854,7 +854,9 @@ class ProcessBuilder {
libs[mdl.getVersionlessMavenIdentifier()] = mdl.getPath()
if(mdl.subModules.length > 0){
const res = this._resolveModuleLibraries(mdl)
libs = {...libs, ...res}
if(res.length > 0){
libs = {...libs, ...res}
}
}
}
}
@ -863,7 +865,9 @@ class ProcessBuilder {
for(let i=0; i<mods.length; i++){
if(mods.sub_modules != null){
const res = this._resolveModuleLibraries(mods[i])
libs = {...libs, ...res}
if(res.length > 0){
libs = {...libs, ...res}
}
}
}
@ -874,25 +878,27 @@ class ProcessBuilder {
* Recursively resolve the path of each library required by this module.
*
* @param {Object} mdl A module object from the server distro index.
* @returns {{[id: string]: string}} An object containing the paths of each library this module requires.
* @returns {Array.<string>} An array containing the paths of each library this module requires.
*/
_resolveModuleLibraries(mdl){
if(!mdl.subModules.length > 0){
return {}
return []
}
let libs = {}
let libs = []
for(let sm of mdl.subModules){
if(sm.rawModule.type === Type.Library){
if(sm.rawModule.classpath ?? true) {
libs[sm.getVersionlessMavenIdentifier()] = sm.getPath()
libs.push(sm.getPath())
}
}
// If this module has submodules, we need to resolve the libraries for those.
// To avoid unnecessary recursive calls, base case is checked here.
if(mdl.subModules.length > 0){
const res = this._resolveModuleLibraries(sm)
libs = {...libs, ...res}
if(res.length > 0){
libs = libs.concat(res)
}
}
}
return libs