From c56ac850c2ebf82b0a5947c7e20de744953fbdc7 Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Tue, 5 May 2020 14:39:37 +0200
Subject: [PATCH] Clean up BuildFiles under DQMServices/

Clean up BuildFile.xml filea with `xmllint --format`.
---
 DQMServices/Components/BuildFile.xml         |  8 +++---
 DQMServices/Components/plugins/BuildFile.xml | 30 ++++++++++----------
 DQMServices/Components/test/BuildFile.xml    | 11 ++++---
 DQMServices/Core/BuildFile.xml               | 20 ++++++-------
 DQMServices/Core/plugins/BuildFile.xml       |  6 ++--
 DQMServices/Core/test/BuildFile.xml          | 15 +++++-----
 DQMServices/Demo/plugins/BuildFile.xml       |  2 +-
 DQMServices/Demo/test/BuildFile.xml          | 14 ++++-----
 DQMServices/Examples/BuildFile.xml           | 16 +++++------
 DQMServices/Examples/plugins/BuildFile.xml   | 12 ++++----
 DQMServices/FileIO/plugins/BuildFile.xml     | 25 ++++++++--------
 DQMServices/FwkIO/plugins/BuildFile.xml      | 24 ++++++++--------
 DQMServices/FwkIO/test/BuildFile.xml         | 21 +++++++-------
 DQMServices/StreamerIO/plugins/BuildFile.xml | 19 ++++++-------
 DQMServices/StreamerIO/test/BuildFile.xml    | 17 +++++------
 15 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/DQMServices/Components/BuildFile.xml b/DQMServices/Components/BuildFile.xml
index 05c02f6934030..1588fd4fc84b8 100644
--- a/DQMServices/Components/BuildFile.xml
+++ b/DQMServices/Components/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="EventFilter/Utilities"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="roothistmatrix"/>
+<use name="EventFilter/Utilities"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="roothistmatrix"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DQMServices/Components/plugins/BuildFile.xml b/DQMServices/Components/plugins/BuildFile.xml
index 9727049b2ef26..f1fd4569d1f06 100644
--- a/DQMServices/Components/plugins/BuildFile.xml
+++ b/DQMServices/Components/plugins/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="CondFormats/RunInfo"/>
-<use   name="DQMServices/Core"/>
-<use   name="DQMServices/Components"/>
-<use   name="DataFormats/Histograms"/>
-<use   name="DataFormats/OnlineMetaData"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Version"/>
-<use   name="DataFormats/Luminosity"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="boost"/>
-<library   file="*.cc" name="DQMServicesComponentsPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CondFormats/RunInfo"/>
+<use name="DQMServices/Core"/>
+<use name="DQMServices/Components"/>
+<use name="DataFormats/Histograms"/>
+<use name="DataFormats/OnlineMetaData"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/Version"/>
+<use name="DataFormats/Luminosity"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="boost"/>
+<library file="*.cc" name="DQMServicesComponentsPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DQMServices/Components/test/BuildFile.xml b/DQMServices/Components/test/BuildFile.xml
index acd0a314377e6..f6b28eba7b13c 100644
--- a/DQMServices/Components/test/BuildFile.xml
+++ b/DQMServices/Components/test/BuildFile.xml
@@ -1,13 +1,12 @@
-<use   name="FWCore/Utilities"/>
-<use   name="roothistmatrix"/>
-<use   name="protobuf"/>
+<use name="FWCore/Utilities"/>
+<use name="roothistmatrix"/>
+<use name="protobuf"/>
 <use name="cppunit"/>
-
 <environment>
   <bin name="runFastHadd" file="runFastHadd.cpp">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash DQMServices/Components/test run_fastHadd_tests.sh"/>
+    <flags TEST_RUNNER_ARGS=" /bin/bash DQMServices/Components/test run_fastHadd_tests.sh"/>
   </bin>
-</environment>
 
+</environment>
 <bin file="testSchemaEvolution.cpp">
 </bin>
diff --git a/DQMServices/Core/BuildFile.xml b/DQMServices/Core/BuildFile.xml
index 860763c412528..bfccfae54c106 100644
--- a/DQMServices/Core/BuildFile.xml
+++ b/DQMServices/Core/BuildFile.xml
@@ -1,12 +1,12 @@
-<flags   CPPFLAGS="-DWITHOUT_CMS_FRAMEWORK=0"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Version"/>
-<use   name="classlib"/>
-<use   name="roothistmatrix"/>
-<use   name="protobuf"/>
+<flags CPPFLAGS="-DWITHOUT_CMS_FRAMEWORK=0"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/Version"/>
+<use name="classlib"/>
+<use name="roothistmatrix"/>
+<use name="protobuf"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DQMServices/Core/plugins/BuildFile.xml b/DQMServices/Core/plugins/BuildFile.xml
index df5ba4a2ca5cf..34f4b9725810b 100644
--- a/DQMServices/Core/plugins/BuildFile.xml
+++ b/DQMServices/Core/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="DQMServices/Core"/>
-<library   file="*.cc" name="DQMServicesCorePlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DQMServices/Core"/>
+<library file="*.cc" name="DQMServicesCorePlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DQMServices/Core/test/BuildFile.xml b/DQMServices/Core/test/BuildFile.xml
index d4fbc52b61a41..5c1268a7658ec 100644
--- a/DQMServices/Core/test/BuildFile.xml
+++ b/DQMServices/Core/test/BuildFile.xml
@@ -1,9 +1,10 @@
-<use   name="DQMServices/Core"/>
-<use   name="FWCore/Framework"/>
-<use   name="boost"/>
-<library   file="DQMSourceExampleConfig.cc" name="DQMServicesCoreSourceExample">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DQMServices/Core"/>
+<use name="FWCore/Framework"/>
+<use name="boost"/>
+<library file="DQMSourceExampleConfig.cc" name="DQMServicesCoreSourceExample">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="DQMTestMultiThread.cc" name="DQMTestMultiThread">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DQMTestMultiThread.cc" name="DQMTestMultiThread">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DQMServices/Demo/plugins/BuildFile.xml b/DQMServices/Demo/plugins/BuildFile.xml
index 50c6e31d9cdbf..329bda1be142a 100644
--- a/DQMServices/Demo/plugins/BuildFile.xml
+++ b/DQMServices/Demo/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="DQMServices/Core" />
+<use name="DQMServices/Core"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/DQMServices/Demo/test/BuildFile.xml b/DQMServices/Demo/test/BuildFile.xml
index a8b17be30b65d..ad2932b8fae7f 100644
--- a/DQMServices/Demo/test/BuildFile.xml
+++ b/DQMServices/Demo/test/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="DQMServices/Core"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-
-<library   file="*.cc" name="DQMServicesDemoTestPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DQMServices/Core"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<library file="*.cc" name="DQMServicesDemoTestPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
+
 <bin file="TestRunner.cpp" name="TestDQMServicesDemo">
   <flags TEST_RUNNER_ARGS=" /bin/bash DQMServices/Demo/test runtests.sh"/>
 </bin>
diff --git a/DQMServices/Examples/BuildFile.xml b/DQMServices/Examples/BuildFile.xml
index 5b9f3b6d91fc6..36fd77efd3393 100644
--- a/DQMServices/Examples/BuildFile.xml
+++ b/DQMServices/Examples/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="DQMServices/Core"/>
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/METReco"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="RecoEgamma/EgammaTools"/>
+<use name="DQMServices/Core"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/METReco"/>
+<use name="DataFormats/VertexReco"/>
+<use name="RecoEgamma/EgammaTools"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DQMServices/Examples/plugins/BuildFile.xml b/DQMServices/Examples/plugins/BuildFile.xml
index 9960bcd096aba..71ffb9c670962 100644
--- a/DQMServices/Examples/plugins/BuildFile.xml
+++ b/DQMServices/Examples/plugins/BuildFile.xml
@@ -1,7 +1,7 @@
-<library   file="*.cc" name="DQMServicesExamplesPlugins">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="DQMServices/Examples"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="DQMServices/Core"/>
+<library file="*.cc" name="DQMServicesExamplesPlugins">
+  <flags EDM_PLUGIN="1"/>
+  <use name="DQMServices/Examples"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/Framework"/>
+  <use name="DQMServices/Core"/>
 </library>
diff --git a/DQMServices/FileIO/plugins/BuildFile.xml b/DQMServices/FileIO/plugins/BuildFile.xml
index 719056b3e9df4..566c02f1e084a 100644
--- a/DQMServices/FileIO/plugins/BuildFile.xml
+++ b/DQMServices/FileIO/plugins/BuildFile.xml
@@ -1,14 +1,13 @@
-<use   name="DQMServices/Core"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="EventFilter/Utilities"/>
-<use   name="boost"/>
-<use   name="boost_iostreams"/>
-<use   name="boost_filesystem"/>
-
-<library  file="*.cc" name="DQMServicesFileIOPlugins">
-  <flags   EDM_PLUGIN="1" />
-  <flags   CXXFLAGS="-lboost_iostreams" />
+<use name="DQMServices/Core"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="EventFilter/Utilities"/>
+<use name="boost"/>
+<use name="boost_iostreams"/>
+<use name="boost_filesystem"/>
+<library file="*.cc" name="DQMServicesFileIOPlugins">
+  <flags EDM_PLUGIN="1"/>
+  <flags CXXFLAGS="-lboost_iostreams"/>
 </library>
diff --git a/DQMServices/FwkIO/plugins/BuildFile.xml b/DQMServices/FwkIO/plugins/BuildFile.xml
index 8f12c2d9e61f0..2264ed1a722eb 100644
--- a/DQMServices/FwkIO/plugins/BuildFile.xml
+++ b/DQMServices/FwkIO/plugins/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="DataFormats/Histograms"/>
-<use   name="DQMServices/Core"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Sources"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Catalog"/>
-<use   name="roothistmatrix"/>
-<use   name="boost_filesystem"/>
-<library   file="*.cc" name="DQMServicesFwkIOPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/Histograms"/>
+<use name="DQMServices/Core"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Sources"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/Catalog"/>
+<use name="roothistmatrix"/>
+<use name="boost_filesystem"/>
+<library file="*.cc" name="DQMServicesFwkIOPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DQMServices/FwkIO/test/BuildFile.xml b/DQMServices/FwkIO/test/BuildFile.xml
index b812b8867c8aa..5b457807be03e 100644
--- a/DQMServices/FwkIO/test/BuildFile.xml
+++ b/DQMServices/FwkIO/test/BuildFile.xml
@@ -1,12 +1,13 @@
-<use   name="DQMServices/Core"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="roothistmatrix"/>
-<library   file="*.cc" name="DQMServicesFwkIOTestPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DQMServices/Core"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="roothistmatrix"/>
+<library file="*.cc" name="DQMServicesFwkIOTestPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<bin   file="TestIntegration.cpp" name="TestDQMServicesFwkIOScripts">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash DQMServices/FwkIO/test run_tests.sh"/>
+
+<bin file="TestIntegration.cpp" name="TestDQMServicesFwkIOScripts">
+  <flags TEST_RUNNER_ARGS=" /bin/bash DQMServices/FwkIO/test run_tests.sh"/>
 </bin>
diff --git a/DQMServices/StreamerIO/plugins/BuildFile.xml b/DQMServices/StreamerIO/plugins/BuildFile.xml
index 2e1be6725c87b..a8cc283eba4cf 100644
--- a/DQMServices/StreamerIO/plugins/BuildFile.xml
+++ b/DQMServices/StreamerIO/plugins/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="IOPool/Streamer"/>
-<use   name="IOPool/Output"/>
-<use   name="DQMServices/Core"/>
-<use   name="DQMServices/Components"/>
-
-<library   file="*.cc" name="DQMServicesStreamerIOPlugins">
-  <flags   EDM_PLUGIN="1"/>
-  <flags   REM_CXXFLAGS="-Werror=unused-variable"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="IOPool/Streamer"/>
+<use name="IOPool/Output"/>
+<use name="DQMServices/Core"/>
+<use name="DQMServices/Components"/>
+<library file="*.cc" name="DQMServicesStreamerIOPlugins">
+  <flags EDM_PLUGIN="1"/>
+  <flags REM_CXXFLAGS="-Werror=unused-variable"/>
 </library>
diff --git a/DQMServices/StreamerIO/test/BuildFile.xml b/DQMServices/StreamerIO/test/BuildFile.xml
index 886cb757acd29..c3a8d0af9271d 100644
--- a/DQMServices/StreamerIO/test/BuildFile.xml
+++ b/DQMServices/StreamerIO/test/BuildFile.xml
@@ -1,10 +1,11 @@
-<use   name="FWCore/Framework"/>
-<use   name="IOPool/Streamer"/>
-<use   name="EventFilter/Utilities"/>
-<use   name="DQMServices/Components"/>
-<library   file="*.cc" name="DQMServicesStreamerIOTestPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="IOPool/Streamer"/>
+<use name="EventFilter/Utilities"/>
+<use name="DQMServices/Components"/>
+<library file="*.cc" name="DQMServicesStreamerIOTestPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<bin   file="RunThis_t.cpp" name="DQMServicesStreamerIORunStreamer">
-  <flags   TEST_RUNNER_ARGS="/bin/bash DQMServices/StreamerIO/test RunStreamer.sh"/>
+
+<bin file="RunThis_t.cpp" name="DQMServicesStreamerIORunStreamer">
+  <flags TEST_RUNNER_ARGS="/bin/bash DQMServices/StreamerIO/test RunStreamer.sh"/>
 </bin>