Connect features from command line with those parsed in files.

sierdzio · Jun 22, 2018 · 6445af1 · 6445af1
1 parent 877e872
commit 6445af1
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 9 deletions.
diff --git a/gibs/src/baseparser.cpp b/gibs/src/baseparser.cpp
@@ -12,9 +12,7 @@ BaseParser::BaseParser(Scope *scope, QObject *parent) : QObject(parent),
     connect(this, &BaseParser::defines, scope, &Scope::addDefines);
     connect(this, &BaseParser::includes, scope, &Scope::addIncludePaths);
     connect(this, &BaseParser::libs, scope, &Scope::addLibs);
-    connect(this, &BaseParser::feature, scope, &Scope::feature);
-    // ProjectManager is responsible for this
-    //connect(this, &BaseParser::feature, scope, &Scope::onFeature);
+    connect(this, &BaseParser::feature, scope, &Scope::onFeature);
 }
 
 bool BaseParser::parseCommand(const QString &commandString)

diff --git a/gibs/src/projectmanager.cpp b/gibs/src/projectmanager.cpp
@@ -68,7 +68,8 @@ void ProjectManager::start()
                                           mFlags.relativePath(),
                                           mFlags.prefix(),
                                           mFlags.qtDir(),
-                                          mFlags.parseWholeFiles());
+                                          mFlags.parseWholeFiles(),
+                                          mFeatures);
         connectScope(scope);
 
         if (!mGlobalScope.isNull()) {
@@ -209,7 +210,8 @@ void ProjectManager::loadCommands()
     if (mGlobalScope.isNull()) {
         mGlobalScope = ScopePtr::create(Tags::globalScope, mFlags.relativePath(),
                                         mFlags.prefix(), mFlags.qtDir(),
-                                        mFlags.parseWholeFiles());
+                                        mFlags.parseWholeFiles(),
+                                        mFeatures);
         connectScope(mGlobalScope);
         mScopes.insert(mGlobalScope->id(), mGlobalScope);
     }
@@ -220,6 +222,11 @@ void ProjectManager::loadCommands()
     parser.parse();
 }
 
+void ProjectManager::loadFeatures(const QHash<QString, Gibs::Feature> &features)
+{
+    mFeatures = features;
+}
+
 /*!
  * Register new subproject. If current scope (\a scopeId) depends on the new
  * project, it will be added to \a scopeId later.
@@ -235,7 +242,8 @@ void ProjectManager::onSubproject(const QByteArray &scopeId, const QString &path
                                       oldScope->relativePath() + "/" + newRelativePath,
                                       mFlags.prefix(),
                                       mFlags.qtDir(),
-                                      mFlags.parseWholeFiles());
+                                      mFlags.parseWholeFiles(),
+                                      mFeatures);
     //qDebug() << "Subproject:" << scope->name() << "STARTING!";
     connectScope(scope);
 
@@ -262,6 +270,11 @@ void ProjectManager::onSubproject(const QByteArray &scopeId, const QString &path
                       });
 }
 
+void ProjectManager::onFeatureUpdated(const Gibs::Feature &feature)
+{
+    mFeatures.insert(feature.name, feature);
+}
+
 void ProjectManager::onProcessErrorOccurred(QProcess::ProcessError _error)
 {
     auto process = qobject_cast<QProcess *>(sender());

diff --git a/gibs/src/projectmanager.h b/gibs/src/projectmanager.h
@@ -30,6 +30,7 @@ class ProjectManager : public QObject
 
     void loadCache();
     void loadCommands();
+    void loadFeatures(const QHash<QString, Gibs::Feature> &features);
 
 signals:
     void error(const QString &error) const;
@@ -45,6 +46,7 @@ protected slots:
     void onError(const QString &error);
     void saveCache() const;
     void onSubproject(const QByteArray &scopeId, const QString &path);
+    void onFeatureUpdated(const Gibs::Feature &feature);
 
     // Process handling
     void onProcessErrorOccurred(QProcess::ProcessError _error);
@@ -63,6 +65,8 @@ protected slots:
 
     // scopeId, scope
     QHash<QByteArray, ScopePtr> mScopes;
+    // name, Feature
+    QHash<QString, Gibs::Feature> mFeatures;
 
     QVector<MetaProcessPtr> mProcessQueue;
     QVector<ProcessPtr> mRunningJobs;

diff --git a/gibs/src/scope.cpp b/gibs/src/scope.cpp
@@ -16,14 +16,16 @@ Scope::Scope(const QString &name,
              const QString &prefix,
              const QString &qtDir,
              const bool parseWholeFiles,
+             const QHash<QString, Gibs::Feature> &features,
              QObject *parent)
     : QObject(parent),
       mParseWholeFiles(parseWholeFiles),
       mRelativePath(relativePath),
       mPrefix(prefix),
       mName(name),
       mId(QCryptographicHash::hash(name.toUtf8(), QCryptographicHash::Sha1)),
-      mQtDir(qtDir)
+      mQtDir(qtDir),
+      mFeatures(features)
 {
     addIncludePaths({"."});
 
@@ -622,7 +624,7 @@ void Scope::onFeature(const QString &name, const bool isOn)
         feat.name = name;
         feat.define = Gibs::normalizeFeatureName(name);
         result = feat;
-        emit feature(name, isOn);
+        emit feature(feat);
     }
 
     if (result.enabled) {

diff --git a/gibs/src/scope.h b/gibs/src/scope.h
@@ -27,6 +27,7 @@ class Scope : public QObject
     explicit Scope(const QString &name, const QString &relativePath,
                    const QString &prefix, const QString &qtDir,
                    const bool parseWholeFiles,
+                   const QHash<QString, Gibs::Feature> &features,
                    QObject *parent = nullptr);
 
     QString name() const;
@@ -88,7 +89,7 @@ public slots:
     void error(const QString &error) const;
     void runProcess(const QString &app, const QStringList &arguments, const MetaProcessPtr &mp) const;
     void subproject(const QByteArray &scopeId, const QString &path) const;    
-    void feature(const QString &name, const bool defaultOn) const;
+    void feature(const Gibs::Feature &feature) const;
 
 protected:
     QString compile(const QString &file);

diff --git a/samples/simpletest-feature/custom-test-run.sh b/samples/simpletest-feature/custom-test-run.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# This is a helper script for scripts/run-compilation-tests.sh
+
+CUSTOM_PATH=""
+CUSTOM_ARGS="-- --my-feature"