aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/language/moduleloader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/language/moduleloader.cpp')
-rwxr-xr-xsrc/lib/corelib/language/moduleloader.cpp132
1 files changed, 72 insertions, 60 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index e861f2dfd..232c91a2c 100755
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -523,6 +523,8 @@ void ModuleLoader::handleTopLevelProject(ModuleLoaderResult *loadResult, Item *p
TopLevelProjectContext tlp;
tlp.buildDirectory = buildDirectory;
handleProject(loadResult, &tlp, projectItem, referencedFilePaths);
+ collectProductsByName(tlp);
+ adjustDependenciesForMultiplexing(tlp);
for (ProjectContext * const projectContext : qAsConst(tlp.projects)) {
m_reader->setExtraSearchPathsStack(projectContext->searchPathsStack);
@@ -661,7 +663,6 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult,
break;
}
}
- adjustDependenciesForMultiplexing(projectContext);
m_reader->popExtraSearchPaths();
}
@@ -858,76 +859,79 @@ QList<Item *> ModuleLoader::multiplexProductItem(ProductContext *dummyContext, I
return additionalProductItems;
}
-void ModuleLoader::adjustDependenciesForMultiplexing(const ProjectContext &projectContext)
+void ModuleLoader::adjustDependenciesForMultiplexing(const TopLevelProjectContext &tlp)
{
- for (const ProductContext &product : projectContext.products)
- m_productsByName.insert({ product.name, &product });
+ for (const ProjectContext * const project : tlp.projects) {
+ for (const ProductContext &product : project->products)
+ adjustDependenciesForMultiplexing(product);
+ }
+}
- const QString multiplexConfigurationIdKey = QStringLiteral("multiplexConfigurationId");
- for (const ProductContext &product : projectContext.products) {
- std::vector<Item *> additionalDependsItems;
- for (Item *dependsItem : product.item->children()) {
- if (dependsItem->type() != ItemType::Depends)
- continue;
- const QString name = m_evaluator->stringValue(dependsItem, QStringLiteral("name"));
- const bool productIsMultiplexed = !product.multiplexConfigurationId.isEmpty();
- if (name == product.name) {
- QBS_CHECK(!productIsMultiplexed); // This product must be an aggregator.
- continue;
- }
- const auto productRange = m_productsByName.equal_range(name);
- std::vector<const ProductContext *> dependencies;
- bool hasNonMultiplexedDependency = false;
- for (auto it = productRange.first; it != productRange.second; ++it) {
- if (!it->second->multiplexConfigurationId.isEmpty()) {
- dependencies.push_back(it->second);
- if (productIsMultiplexed)
- break;
- } else {
- hasNonMultiplexedDependency = true;
+void ModuleLoader::adjustDependenciesForMultiplexing(const ModuleLoader::ProductContext &product)
+{
+ static const QString multiplexConfigurationIdKey = QStringLiteral("multiplexConfigurationId");
+ std::vector<Item *> additionalDependsItems;
+ for (Item *dependsItem : product.item->children()) {
+ if (dependsItem->type() != ItemType::Depends)
+ continue;
+ const QString name = m_evaluator->stringValue(dependsItem, QStringLiteral("name"));
+ const bool productIsMultiplexed = !product.multiplexConfigurationId.isEmpty();
+ if (name == product.name) {
+ QBS_CHECK(!productIsMultiplexed); // This product must be an aggregator.
+ continue;
+ }
+ const auto productRange = m_productsByName.equal_range(name);
+ std::vector<const ProductContext *> dependencies;
+ bool hasNonMultiplexedDependency = false;
+ for (auto it = productRange.first; it != productRange.second; ++it) {
+ if (!it->second->multiplexConfigurationId.isEmpty()) {
+ dependencies.push_back(it->second);
+ if (productIsMultiplexed)
break;
- }
+ } else {
+ hasNonMultiplexedDependency = true;
+ break;
}
+ }
- // These are the allowed cases:
- // (1) Normal dependency with no multiplexing whatsoever.
- // (2) Both product and dependency are multiplexed.
- // (3) The product is not multiplexed, but the dependency is.
- // (3a) The dependency has an aggregator. We want to depend on the aggregator.
- // (3b) The dependency does not have an aggregator. We want to depend on all the
- // multiplexed variants.
- // (4) The product is multiplexed, but the dependency is not. This case is implicitly
- // handled, because we don't have to adapt any Depends items.
-
- // (1) and (3a)
- if (!productIsMultiplexed && hasNonMultiplexedDependency)
- continue;
+ // These are the allowed cases:
+ // (1) Normal dependency with no multiplexing whatsoever.
+ // (2) Both product and dependency are multiplexed.
+ // (3) The product is not multiplexed, but the dependency is.
+ // (3a) The dependency has an aggregator. We want to depend on the aggregator.
+ // (3b) The dependency does not have an aggregator. We want to depend on all the
+ // multiplexed variants.
+ // (4) The product is multiplexed, but the dependency is not. This case is implicitly
+ // handled, because we don't have to adapt any Depends items.
- for (std::size_t i = 0; i < dependencies.size(); ++i) {
- const QString depMultiplexId = dependencies.at(i)->multiplexConfigurationId;
- if (i == 0) {
- if (productIsMultiplexed) { // (2)
- dependsItem->setProperty(multiplexConfigurationIdKey,
- product.item->property(multiplexConfigurationIdKey));
- break;
- }
- // (3b)
+ // (1) and (3a)
+ if (!productIsMultiplexed && hasNonMultiplexedDependency)
+ continue;
+
+ for (std::size_t i = 0; i < dependencies.size(); ++i) {
+ const QString depMultiplexId = dependencies.at(i)->multiplexConfigurationId;
+ if (i == 0) {
+ if (productIsMultiplexed) { // (2)
dependsItem->setProperty(multiplexConfigurationIdKey,
- VariantValue::create(depMultiplexId));
- } else {
- // (3b)
- Item * const newDependsItem = dependsItem->clone();
- newDependsItem->setProperty(multiplexConfigurationIdKey,
- VariantValue::create(depMultiplexId));
- dependsItem->setProperty(QStringLiteral("profiles"),
- VariantValue::create(QStringLiteral("*")));
- additionalDependsItems.push_back(newDependsItem);
+ product.item->property(multiplexConfigurationIdKey));
+ break;
}
+ // (3b)
+ dependsItem->setProperty(multiplexConfigurationIdKey,
+ VariantValue::create(depMultiplexId));
+ } else {
+ // (3b)
+ Item * const newDependsItem = dependsItem->clone();
+ newDependsItem->setProperty(multiplexConfigurationIdKey,
+ VariantValue::create(depMultiplexId));
+ dependsItem->setProperty(QStringLiteral("profiles"),
+ VariantValue::create(QStringLiteral("*")));
+ additionalDependsItems.push_back(newDependsItem);
}
}
- for (Item * const newDependsItem : additionalDependsItems)
- Item::addChild(product.item, newDependsItem);
}
+ for (Item * const newDependsItem : additionalDependsItems)
+ Item::addChild(product.item, newDependsItem);
}
void ModuleLoader::prepareProduct(ProjectContext *projectContext, Item *productItem)
@@ -1611,6 +1615,14 @@ Item *ModuleLoader::loadItemFromFile(const QString &filePath)
return item;
}
+void ModuleLoader::collectProductsByName(const TopLevelProjectContext &topLevelProject)
+{
+ for (ProjectContext * const project : topLevelProject.projects) {
+ for (ProductContext &product : project->products)
+ m_productsByName.insert({ product.name, &product });
+ }
+}
+
void ModuleLoader::propagateModulesFromParent(ProductContext *productContext, Item *groupItem,
const ModuleDependencies &reverseDepencencies)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 14:53:58 +0000