Attempt to separate dependent products and sub-components

This commit is contained in:
Dan Hawkins 2022-02-26 20:11:59 +00:00
commit 54bf29f749

View file

@ -124,24 +124,29 @@ def parseproductdependencies(LinkedHashMap<String, ProductParsed> products,
def dependentmeta = productreleasemeta.getassociated(productreleasefolder)
for (meta in dependentmeta) {
if (meta.productinfo.subcomponentname != 'WHOLE') {
def pc = new ProductComponent(meta.productinfo.subcomponentname,
meta.releasetag(),
meta.releaseinfo.releaserepoURL)
productrelease.addProductComponent(pc)
} else {
if (meta.productvariant() != containingproductvariant) {
def pd = new ProductDependency(this,
rt,
meta.productvariant(),
meta.releasetag(),
meta.releaseinfo.releaserepoURL)
pd.setreleasestate()
def pd = new ProductDependency(this,
rt,
meta.productvariant(),
meta.releasetag(),
meta.releaseinfo.releaserepoURL)
pd.setreleasestate()
if (meta.productinfo.subcomponentname == 'WHOLE') {
if (meta.productvariant() != containingproductvariant) { // Don't add myself
addProductEntry(products,
meta.productvariant(),
meta.releaseinfo.releaserepoURL)
productrelease.addProductDependency(pd)
}
} else if (meta.productvariant() != containingproductvariant) {
addProductEntry(products,
meta.productvariant(),
meta.releaseinfo.releaserepoURL)
productrelease.addProductDependency(pd)
} else {
def pc = new ProductComponent(meta.productinfo.subcomponentname,
meta.releasetag(),
meta.releaseinfo.releaserepoURL)
productrelease.addProductComponent(pc)
}
}
}