Give the two copies command.{cpp,h} non-ambiguous names

The pair in tools/buildgraph becomes rulecommands.{cpp,h}
The pair in parser becomes parsercommand.{cpp,h}

This resolves a conflict which prevented compilation of the entire
set of qbs sources with MSVC and the /Fo option.

Change-Id: Ic909d02a230d8e59f3bf4d00fc895bf54739961a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

16 files changed, 19 insertions, 17 deletions

diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index cabe6cb21..b1d626364 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -51,12 +51,12 @@
 #include "runenvironment.h"
 #include <buildgraph/artifact.h>
 #include <buildgraph/buildgraph.h>
-#include <buildgraph/command.h>
 #include <buildgraph/emptydirectoriesremover.h>
 #include <buildgraph/nodetreedumper.h>
 #include <buildgraph/productbuilddata.h>
 #include <buildgraph/productinstaller.h>
 #include <buildgraph/projectbuilddata.h>
+#include <buildgraph/rulecommands.h>
 #include <buildgraph/rulesevaluationcontext.h>
 #include <buildgraph/timestampsupdater.h>
 #include <buildgraph/transformer.h>
diff --git a/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp b/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
index cacea2d98..1ed5f21f3 100644
--- a/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
@@ -39,7 +39,7 @@
 
 #include "abstractcommandexecutor.h"
 
-#include "command.h"
+#include "rulecommands.h"
 
 #include <logging/translator.h>
 #include <tools/error.h>
diff --git a/src/lib/corelib/buildgraph/buildgraph.pri b/src/lib/corelib/buildgraph/buildgraph.pri
index 5ce4081d7..5ea37d210 100644
--- a/src/lib/corelib/buildgraph/buildgraph.pri
+++ b/src/lib/corelib/buildgraph/buildgraph.pri
@@ -8,7 +8,6 @@ SOURCES += \
     $$PWD/buildgraph.cpp \
     $$PWD/buildgraphloader.cpp \
     $$PWD/buildgraphnode.cpp \
-    $$PWD/command.cpp \
     $$PWD/cycledetector.cpp \
     $$PWD/depscanner.cpp \
     $$PWD/emptydirectoriesremover.cpp \
@@ -25,6 +24,7 @@ SOURCES += \
     $$PWD/projectbuilddata.cpp \
     $$PWD/qtmocscanner.cpp \
     $$PWD/rescuableartifactdata.cpp \
+    $$PWD/rulecommands.cpp \
     $$PWD/rulegraph.cpp \
     $$PWD/rulenode.cpp \
     $$PWD/rulesapplicator.cpp \
@@ -42,7 +42,6 @@ HEADERS += \
     $$PWD/buildgraphloader.h \
     $$PWD/buildgraphnode.h \
     $$PWD/buildgraphvisitor.h \
-    $$PWD/command.h \
     $$PWD/cycledetector.h \
     $$PWD/depscanner.h \
     $$PWD/emptydirectoriesremover.h \
@@ -61,6 +60,7 @@ HEADERS += \
     $$PWD/qtmocscanner.h \
     $$PWD/rawscanneddependency.h \
     $$PWD/rescuableartifactdata.h \
+    $$PWD/rulecommands.h \
     $$PWD/rulegraph.h \
     $$PWD/rulenode.h \
     $$PWD/rulesapplicator.h \
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index cca9f424c..6ba3264b6 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -39,11 +39,11 @@
 #include "buildgraphloader.h"
 
 #include "buildgraph.h"
-#include "command.h"
 #include "cycledetector.h"
 #include "emptydirectoriesremover.h"
 #include "productbuilddata.h"
 #include "projectbuilddata.h"
+#include "rulecommands.h"
 #include "rulesevaluationcontext.h"
 #include "transformer.h"
 
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index 61e8dad5c..64a7cb498 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -39,7 +39,6 @@
 #include "executor.h"
 
 #include "buildgraph.h"
-#include "command.h"
 #include "emptydirectoriesremover.h"
 #include "productbuilddata.h"
 #include "projectbuilddata.h"
@@ -48,6 +47,7 @@
 #include "inputartifactscanner.h"
 #include "productinstaller.h"
 #include "rescuableartifactdata.h"
+#include "rulecommands.h"
 #include "rulenode.h"
 #include "rulesevaluationcontext.h"
 
diff --git a/src/lib/corelib/buildgraph/executorjob.cpp b/src/lib/corelib/buildgraph/executorjob.cpp
index d1ce1fdad..56c9a8ac3 100644
--- a/src/lib/corelib/buildgraph/executorjob.cpp
+++ b/src/lib/corelib/buildgraph/executorjob.cpp
@@ -40,9 +40,9 @@
 #include "executorjob.h"
 
 #include "artifact.h"
-#include "command.h"
 #include "jscommandexecutor.h"
 #include "processcommandexecutor.h"
+#include "rulecommands.h"
 #include "transformer.h"
 #include <language/language.h>
 #include <tools/error.h>
diff --git a/src/lib/corelib/buildgraph/jscommandexecutor.cpp b/src/lib/corelib/buildgraph/jscommandexecutor.cpp
index cff46f128..b382e785a 100644
--- a/src/lib/corelib/buildgraph/jscommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/jscommandexecutor.cpp
@@ -41,7 +41,7 @@
 
 #include "artifact.h"
 #include "buildgraph.h"
-#include "command.h"
+#include "rulecommands.h"
 #include "transformer.h"
 
 #include <language/language.h>
diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
index b882c8f14..9eae591eb 100644
--- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
@@ -40,7 +40,7 @@
 #include "processcommandexecutor.h"
 
 #include "artifact.h"
-#include "command.h"
+#include "rulecommands.h"
 #include "transformer.h"
 
 #include <language/language.h>
diff --git a/src/lib/corelib/buildgraph/productbuilddata.cpp b/src/lib/corelib/buildgraph/productbuilddata.cpp
index b7ce7afa9..7006fef13 100644
--- a/src/lib/corelib/buildgraph/productbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/productbuilddata.cpp
@@ -38,8 +38,9 @@
 ****************************************************************************/
 #include "productbuilddata.h"
 
-#include "command.h"
+#include "artifact.h"
 #include "projectbuilddata.h"
+#include "rulecommands.h"
 #include <language/language.h>
 #include <logging/logger.h>
 #include <tools/error.h>
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp
index cdd7e4146..cd05c9d80 100644
--- a/src/lib/corelib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp
@@ -42,7 +42,7 @@
 #include "buildgraph.h"
 #include "buildgraphvisitor.h"
 #include "productbuilddata.h"
-#include "command.h"
+#include "rulecommands.h"
 #include "rulegraph.h"
 #include "rulenode.h"
 #include "rulesevaluationcontext.h"
diff --git a/src/lib/corelib/buildgraph/rescuableartifactdata.cpp b/src/lib/corelib/buildgraph/rescuableartifactdata.cpp
index 76a4446fe..96bdf64f9 100644
--- a/src/lib/corelib/buildgraph/rescuableartifactdata.cpp
+++ b/src/lib/corelib/buildgraph/rescuableartifactdata.cpp
@@ -39,7 +39,7 @@
 
 #include "rescuableartifactdata.h"
 
-#include "command.h"
+#include "rulecommands.h"
 
 #include <language/propertymapinternal.h>
 
diff --git a/src/lib/corelib/buildgraph/command.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp
index 494acf699..9226c67b4 100644
--- a/src/lib/corelib/buildgraph/command.cpp
+++ b/src/lib/corelib/buildgraph/rulecommands.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "command.h"
+#include "rulecommands.h"
 #include <logging/translator.h>
 #include <tools/error.h>
 #include <tools/hostosinfo.h>
diff --git a/src/lib/corelib/buildgraph/command.h b/src/lib/corelib/buildgraph/rulecommands.h
index 83c4c2783..83c4c2783 100644
--- a/src/lib/corelib/buildgraph/command.h
+++ b/src/lib/corelib/buildgraph/rulecommands.h
diff --git a/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp b/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
index ad8c862e3..1afaea9ce 100644
--- a/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
+++ b/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
@@ -39,7 +39,7 @@
 #include "rulesevaluationcontext.h"
 
 #include "artifact.h"
-#include "command.h"
+#include "rulecommands.h"
 #include "transformer.h"
 #include <language/language.h>
 #include <language/scriptengine.h>
diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp
index 8a21fa203..c6e40d18d 100644
--- a/src/lib/corelib/buildgraph/transformer.cpp
+++ b/src/lib/corelib/buildgraph/transformer.cpp
@@ -38,7 +38,8 @@
 ****************************************************************************/
 #include "transformer.h"
 
-#include "command.h"
+#include "artifact.h"
+#include "rulecommands.h"
 #include "rulesevaluationcontext.h"
 #include <jsextensions/moduleproperties.h>
 #include <language/language.h>
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index 3d3cade35..0d370e99c 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -105,8 +105,6 @@ QbsLibrary {
             "buildgraphloader.cpp",
             "buildgraphloader.h",
             "buildgraphvisitor.h",
-            "command.cpp",
-            "command.h",
             "cycledetector.cpp",
             "cycledetector.h",
             "depscanner.cpp",
@@ -140,6 +138,8 @@ QbsLibrary {
             "rawscanneddependency.h",
             "rescuableartifactdata.cpp",
             "rescuableartifactdata.h",
+            "rulecommands.cpp",
+            "rulecommands.h",
             "rulegraph.cpp",
             "rulegraph.h",
             "rulenode.cpp",