WIP: add feature parsing to command line.

README.md

@@ -198,11 +198,11 @@ To define a feature, use this syntax:
 
 Then you can select the feature next time you build your project, like this:
 
-    gibs main.cpp --tts-support
+    gibs main.cpp -- --tts-support
 
 Or unselect it using:
 
-    gibs main.cpp --no-tts-support
+    gibs main.cpp -- --no-tts-support
 
 # Recommendations
 

gibs/src/gibs.cpp

@@ -1,5 +1,7 @@
 #include "gibs.h"
 
+#include <QDebug>
+
 void Gibs::removeFile(const QString &path) {
     if (QFile::exists(path)) {
         qInfo() << "Removing:" << path;
@@ -17,3 +19,37 @@ QString Gibs::normalizeFeatureName(const QString &name)
     result = result.replace('-', '_');
     return result;
 }
+
+/*!
+ * Converts a \a command line flag into Feature and returns it.
+ *
+ * For example:
+ * $ gibs main.cpp -- --tts-support --no-opengl
+ *
+ * If you call this function for boths flags, it will enable TTS support, but
+ * keep OpenGL turned off.
+ */
+Gibs::Feature Gibs::commandLineToFeature(const QString &command)
+{
+    Gibs::Feature result;
+    const QString negative("--no-");
+
+    if (command.length() < 2 or !command.startsWith("--")) {
+        qFatal("Invalid feature name: %s", qPrintable(command));
+    }
+
+    if (command.startsWith(negative)) {
+        result.name = command.mid(negative.length());
+        result.enabled = false;
+    } else {
+        // Cut '--' from beginning of the string:
+        result.name = command.mid(2);
+        result.enabled = true;
+    }
+
+    result.define = Gibs::normalizeFeatureName(result.name);
+    // result.defined is intentionally left out. Scope is responsible for setting
+    // it.
+
+    return result;
+}

gibs/src/gibs.h

@@ -6,6 +6,14 @@
 #include <QDebug>
 
 namespace Gibs {
+struct Feature {
+    QString name;
+    QString define;
+    bool defined = false;
+    bool enabled = false;
+};
+
 void removeFile(const QString &path);
 QString normalizeFeatureName(const QString &name);
+Feature commandLineToFeature(const QString &command);
 }

gibs/src/main.cpp

@@ -142,9 +142,22 @@ int main(int argc, char *argv[]) {
         qInfo() << "Maximum number of jobs:" << flags.jobs();
     }
 
+    // Extract features:
+    if (args.length() > 1) {
+        const auto commands = args.mid(1);
+        qDebug() << "Features:" << commands;
+        QHash<QString, Gibs::Feature> features;
+        for (const auto &command: commands) {
+            const auto &feature = Gibs::commandLineToFeature(command);
+            features.insert(feature.name, feature);
+            qDebug() << "Feature:" << feature.name << feature.define << feature.defined << feature.enabled;
+        }
+    }
+
     ProjectManager manager(flags);
     manager.loadCache();
     manager.loadCommands();
+    // TODO: pass features to manager
     QObject::connect(&manager, &ProjectManager::finished, &app, &QCoreApplication::exit);
 
     if (flags.clean()) {

gibs/src/scope.cpp

@@ -609,7 +609,23 @@ void Scope::onRunTool(const QString &tool, const QStringList &args)
 
 void Scope::onFeature(const QString &name, const bool isOn)
 {
-    if (isOn) {
+    Gibs::Feature result;
+    if (mFeatures.contains(name)) {
+        auto feat = mFeatures.value(name);
+        feat.defined = true;
+        mFeatures.insert(name, feat);
+        result = feat;
+    } else {
+        Gibs::Feature feat;
+        feat.enabled = isOn;
+        feat.defined = true;
+        feat.name = name;
+        feat.define = Gibs::normalizeFeatureName(name);
+        result = feat;
+        emit feature(name, isOn);
+    }
+
+    if (result.enabled) {
         addDefines(QStringList {name});
     }
 }

gibs/src/scope.h

@@ -13,6 +13,7 @@
 #include "fileinfo.h"
 #include "tags.h"
 #include "metaprocess.h"
+#include "gibs.h"
 
 class Scope;
 
@@ -149,6 +150,8 @@ protected slots:
     QStringList mCustomIncludes;
     QStringList mCustomIncludeFlags;
     QHash<QString, FileInfo> mParsedFiles;
+    // Name, Feature
+    QHash<QString, Gibs::Feature> mFeatures;
     QVector<QByteArray> mScopeDependencyIds;
     QVector<ScopePtr> mScopeDependencies;
     // TODO: change into QStringList and use only file names here.