feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Extensionsystem: Allow pluginspecs to customize how they want to check dependencies

Browse Source 
Change-Id: I84f3a56160588e4842301f4577f7bfdad96463ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-06-13 07:38:40 +02:00
parent bb4c6d2bff
commit 20a6a5cd78
4 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/extensionsystem/pluginspec.cpp
View File

@@ -559,18 +559,17 @@ QString PluginSpec::errorString() const
} }
/*! /*!
Returns whether this plugin can be used to fill in a dependency of the given Returns whether the plugin \a spec can be used to fill the \a dependency of this plugin.
\a pluginName and \a pluginVersion.
\sa PluginSpec::dependencies() \sa PluginSpec::dependencies()
*/ */
bool PluginSpec::provides(const QString &pluginName, const QString &pluginVersion) const bool PluginSpec::provides(PluginSpec *spec, const PluginDependency &dependency) const
{ {
if (QString::compare(pluginName, name(), Qt::CaseInsensitive) != 0) if (QString::compare(dependency.name, spec->name(), Qt::CaseInsensitive) != 0)
return false; return false;
return (versionCompare(version(), pluginVersion) >= 0) return (versionCompare(spec->version(), dependency.version) >= 0)
&& (versionCompare(compatVersion(), pluginVersion) <= 0); && (versionCompare(spec->compatVersion(), dependency.version) <= 0);
} }
/*! /*!
@@ -1075,8 +1074,8 @@ bool PluginSpec::resolveDependencies(const PluginSpecs &specs)
QHash<PluginDependency, PluginSpec *> resolvedDependencies; QHash<PluginDependency, PluginSpec *> resolvedDependencies;
for (const PluginDependency &dependency : d->dependencies) { for (const PluginDependency &dependency : d->dependencies) {
PluginSpec *const found = findOrDefault(specs, [&dependency](PluginSpec *spec) { PluginSpec *const found = findOrDefault(specs, [this, &dependency](PluginSpec *spec) {
return spec->provides(dependency.name, dependency.version); return provides(spec, dependency);
}); });
if (!found) { if (!found) {
if (dependency.type == PluginDependency::Required) { if (dependency.type == PluginDependency::Required) {

13
src/libs/extensionsystem/pluginspec.h
View File

@@ -36,13 +36,14 @@ class PluginView;
struct EXTENSIONSYSTEM_EXPORT PluginDependency struct EXTENSIONSYSTEM_EXPORT PluginDependency
{ {
enum Type { enum Type { Required, Optional, Test };
Required,
Optional,
Test
};
PluginDependency() : type(Required) {} PluginDependency() : type(Required) {}
PluginDependency(const QString &name, const QString &version, Type type = Required)
: name(name)
, version(version)
, type(type)
{}
QString name; QString name;
QString version; QString version;
@@ -130,7 +131,7 @@ public:
virtual void addArgument(const QString &argument); virtual void addArgument(const QString &argument);
virtual QHash<PluginDependency, PluginSpec *> dependencySpecs() const; virtual QHash<PluginDependency, PluginSpec *> dependencySpecs() const;
virtual bool provides(const QString &pluginName, const QString &pluginVersion) const; virtual bool provides(PluginSpec *spec, const PluginDependency &dependency) const;
virtual bool requiresAny(const QSet<PluginSpec *> &plugins) const; virtual bool requiresAny(const QSet<PluginSpec *> &plugins) const;
virtual PluginSpecs enableDependenciesIndirectly(bool enableTestDependencies); virtual PluginSpecs enableDependenciesIndirectly(bool enableTestDependencies);
virtual bool resolveDependencies(const PluginSpecs &pluginSpecs); virtual bool resolveDependencies(const PluginSpecs &pluginSpecs);

2
src/plugins/coreplugin/plugininstallwizard.cpp
View File

@@ -162,7 +162,7 @@ void checkContents(QPromise<ArchiveIssue> &promise, const FilePath &tempDir)
[coreplugin](const PluginDependency &d) { return d.name == coreplugin->name(); }); [coreplugin](const PluginDependency &d) { return d.name == coreplugin->name(); });
if (found == dependencies.constEnd()) if (found == dependencies.constEnd())
return; return;
if (coreplugin->provides(found->name, found->version)) if ((*spec)->provides(coreplugin, *found))
return; return;
promise.addResult( promise.addResult(
ArchiveIssue{Tr::tr("Plugin requires an incompatible version of %1 (%2).") ArchiveIssue{Tr::tr("Plugin requires an incompatible version of %1 (%2).")

36
tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
View File

@@ -190,25 +190,25 @@ void tst_PluginSpec::provides()
CppPluginSpec spec; CppPluginSpec spec;
QVERIFY(spec.readMetaData(metaData("testspecs/simplespec.json"))); QVERIFY(spec.readMetaData(metaData("testspecs/simplespec.json")));
QVERIFY(!spec.provides("SomeOtherPlugin", "2.2.3_9")); QVERIFY(!spec.provides(&spec, {"SomeOtherPlugin", "2.2.3_9"}));
QVERIFY(!spec.provides("MyPlugin", "2.2.3_10")); QVERIFY(!spec.provides(&spec, {"MyPlugin", "2.2.3_10"}));
QVERIFY(!spec.provides("MyPlugin", "2.2.4")); QVERIFY(!spec.provides(&spec, {"MyPlugin", "2.2.4"}));
QVERIFY(!spec.provides("MyPlugin", "2.3.11_1")); QVERIFY(!spec.provides(&spec, {"MyPlugin", "2.3.11_1"}));
QVERIFY(!spec.provides("MyPlugin", "2.3")); QVERIFY(!spec.provides(&spec, {"MyPlugin", "2.3"}));
QVERIFY(!spec.provides("MyPlugin", "3.0")); QVERIFY(!spec.provides(&spec, {"MyPlugin", "3.0"}));
QVERIFY(!spec.provides("MyPlugin", "1.9.9_99")); QVERIFY(!spec.provides(&spec, {"MyPlugin", "1.9.9_99"}));
QVERIFY(!spec.provides("MyPlugin", "1.9")); QVERIFY(!spec.provides(&spec, {"MyPlugin", "1.9"}));
QVERIFY(!spec.provides("MyPlugin", "0.9")); QVERIFY(!spec.provides(&spec, {"MyPlugin", "0.9"}));
QVERIFY(!spec.provides("MyPlugin", "1")); QVERIFY(!spec.provides(&spec, {"MyPlugin", "1"}));
QVERIFY(spec.provides("myplugin", "2.2.3_9")); QVERIFY(spec.provides(&spec, {"myplugin", "2.2.3_9"}));
QVERIFY(spec.provides("MyPlugin", "2.2.3_9")); QVERIFY(spec.provides(&spec, {"MyPlugin", "2.2.3_9"}));
QVERIFY(spec.provides("MyPlugin", "2.2.3_8")); QVERIFY(spec.provides(&spec, {"MyPlugin", "2.2.3_8"}));
QVERIFY(spec.provides("MyPlugin", "2.2.3")); QVERIFY(spec.provides(&spec, {"MyPlugin", "2.2.3"}));
QVERIFY(spec.provides("MyPlugin", "2.2.2")); QVERIFY(spec.provides(&spec, {"MyPlugin", "2.2.2"}));
QVERIFY(spec.provides("MyPlugin", "2.1.2_10")); QVERIFY(spec.provides(&spec, {"MyPlugin", "2.1.2_10"}));
QVERIFY(spec.provides("MyPlugin", "2.0_10")); QVERIFY(spec.provides(&spec, {"MyPlugin", "2.0_10"}));
QVERIFY(spec.provides("MyPlugin", "2")); QVERIFY(spec.provides(&spec, {"MyPlugin", "2"}));
} }
void tst_PluginSpec::experimental() void tst_PluginSpec::experimental()