Remove global log sink.

Applications may not want to use the same log sink for all builds.

The logging facility is also decoupled from the command-line client in other
ways:
    - The LogWriter modifiers for output channel and text color are gone,
      since this type of decision should not be made by low-level code.
      Instead, the "highlight" string can be forwarded to the log sink.
    - The console logger now lives in app/shared, as it must never be used
      by library code.

Change-Id: I8863a554c9b74577320ef23f6f934a74e0f0cbb0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/src/lib/buildgraph/executor.h b/src/lib/buildgraph/executor.h
index 3dba0bb15..3348d7d57 100644
--- a/src/lib/buildgraph/executor.h
+++ b/src/lib/buildgraph/executor.h
@@ -33,6 +33,7 @@
 #include "forward_decls.h"
 #include <buildgraph/artifact.h>
 #include <buildgraph/scanresultcache.h>
+#include <logging/logger.h>
 #include <tools/buildoptions.h>
 #include <tools/error.h>
 #include <tools/settings.h>
@@ -47,6 +48,7 @@ class ProcessResult;
 namespace Internal {
 class AutoMoc;
 class ExecutorJob;
+class FileTime;
 class InputArtifactScannerContext;
 class ProgressObserver;
 class ScanResultCache;
@@ -55,7 +57,7 @@ class Executor : public QObject
 {
     Q_OBJECT
 public:
-    Executor(QObject *parent = 0);
+    Executor(const Logger &logger, QObject *parent = 0);
     ~Executor();
 
     void build(const QList<BuildProductPtr> &productsToBuild);
@@ -102,8 +104,15 @@ private:
     void setupProgressObserver(bool mocWillRun);
     void doSanityChecks();
 
+    bool mustExecuteTransformer(const TransformerPtr &transformer) const;
+    bool isUpToDate(Artifact *artifact) const;
+    void retrieveSourceFileTimestamp(Artifact *artifact) const;
+    FileTime recursiveFileTime(const QString &filePath) const;
+    void insertLeavesAfterAddingDependencies_recurse(Artifact *const artifact,
+            QSet<Artifact *> *seenArtifacts, QList<Artifact *> *leaves) const;
     RulesEvaluationContextPtr m_evalContext;
     BuildOptions m_buildOptions;
+    const Logger m_logger;
     ProgressObserver *m_progressObserver;
     QProcessEnvironment m_baseEnvironment;
     QList<ExecutorJob*> m_availableJobs;
@@ -118,6 +127,8 @@ private:
     int m_mocEffort;
     Error m_error;
     bool m_explicitlyCanceled;
+    const bool m_doTrace;
+    const bool m_doDebug;
 };
 
 } // namespace Internal