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

Clean up BuildFile.xml filea with `xmllint --format`.
---
 DetectorDescription/Core/BuildFile.xml        | 14 ++++----
 .../Core/plugins/BuildFile.xml                |  4 +--
 DetectorDescription/Core/test/BuildFile.xml   | 35 +++++++++++--------
 DetectorDescription/DDCMS/BuildFile.xml       | 17 +++++----
 .../DDCMS/plugins/BuildFile.xml               |  7 ++--
 DetectorDescription/DDCMS/test/BuildFile.xml  | 30 ++++++++++------
 .../OfflineDBLoader/BuildFile.xml             |  4 +--
 .../OfflineDBLoader/plugins/BuildFile.xml     | 16 ++++-----
 DetectorDescription/Parser/BuildFile.xml      | 20 +++++------
 DetectorDescription/Parser/test/BuildFile.xml | 16 ++++-----
 .../RegressionTest/BuildFile.xml              | 10 +++---
 .../RegressionTest/bin/BuildFile.xml          | 10 +++---
 .../RegressionTest/plugins/BuildFile.xml      | 14 ++++----
 .../RegressionTest/test/BuildFile.xml         | 33 +++++++++--------
 14 files changed, 124 insertions(+), 106 deletions(-)

diff --git a/DetectorDescription/Core/BuildFile.xml b/DetectorDescription/Core/BuildFile.xml
index f4905bde0ac51..ed111bde82e5c 100644
--- a/DetectorDescription/Core/BuildFile.xml
+++ b/DetectorDescription/Core/BuildFile.xml
@@ -1,9 +1,9 @@
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="boost"/>
-<use   name="clhep"/>
-<use   name="rootmath"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/PluginManager"/>
+<use name="boost"/>
+<use name="clhep"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DetectorDescription/Core/plugins/BuildFile.xml b/DetectorDescription/Core/plugins/BuildFile.xml
index 610e4768e1e25..d2874a1fde17c 100644
--- a/DetectorDescription/Core/plugins/BuildFile.xml
+++ b/DetectorDescription/Core/plugins/BuildFile.xml
@@ -1,5 +1,5 @@
 <library file="*.cc" name="DetectorDescriptionCorePlugins">
- <use name="DetectorDescription/Core"/>
+  <use name="DetectorDescription/Core"/>
 </library>
-<flags   EDM_PLUGIN="1"/>
 
+<flags EDM_PLUGIN="1"/>
diff --git a/DetectorDescription/Core/test/BuildFile.xml b/DetectorDescription/Core/test/BuildFile.xml
index 51d00ee09dd77..62b629ed03d8b 100644
--- a/DetectorDescription/Core/test/BuildFile.xml
+++ b/DetectorDescription/Core/test/BuildFile.xml
@@ -1,22 +1,29 @@
-<use   name="DetectorDescription/Core"/>
-<use   name="boost"/>
-<use   name="rootmath"/>
-<use   name="cppunit"/>
-<use   name="FWCore/ParameterSet"/>
-<bin   name="testCore" file="testRunner.cpp,DDIsValid.cppunit.cc">
+<use name="DetectorDescription/Core"/>
+<use name="boost"/>
+<use name="rootmath"/>
+<use name="cppunit"/>
+<use name="FWCore/ParameterSet"/>
+<bin name="testCore" file="testRunner.cpp,DDIsValid.cppunit.cc">
 </bin>
-<bin   name="testDDName" file="testRunner.cpp,DDName.cppunit.cc">
+
+<bin name="testDDName" file="testRunner.cpp,DDName.cppunit.cc">
 </bin>
-<bin   name="testStrVector" file="testRunner.cpp,DDStrVector.cppunit.cc">
+
+<bin name="testStrVector" file="testRunner.cpp,DDStrVector.cppunit.cc">
 </bin>
-<bin   name="testDDFilter" file="DDFilter.cppunit.cc,testRunner.cpp"/>
-<bin   name="testShapes" file="testShapes.cpp">
+
+<bin name="testDDFilter" file="DDFilter.cppunit.cc,testRunner.cpp"/>
+<bin name="testShapes" file="testShapes.cpp">
 </bin>
-<bin   name="testUnits" file="testRunner.cpp,DDUnits.cppunit.cc">
+
+<bin name="testUnits" file="testRunner.cpp,DDUnits.cppunit.cc">
 </bin>
-<bin   file="clhepToROOTMath.cpp">
+
+<bin file="clhepToROOTMath.cpp">
 </bin>
-<bin   file="test_DDRotation.cpp">
+
+<bin file="test_DDRotation.cpp">
 </bin>
-<bin  file="Singleton_.cpp">
+
+<bin file="Singleton_.cpp">
 </bin>
diff --git a/DetectorDescription/DDCMS/BuildFile.xml b/DetectorDescription/DDCMS/BuildFile.xml
index 0243b5ab4c007..a6230025fa30d 100644
--- a/DetectorDescription/DDCMS/BuildFile.xml
+++ b/DetectorDescription/DDCMS/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Geometry/MuonNumbering"/>
-<use   name="dd4hep"/>
-<use   name="rootmath"/>
-<use   name="rootgeom"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/MuonNumbering"/>
+<use name="dd4hep"/>
+<use name="rootmath"/>
+<use name="rootgeom"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-
diff --git a/DetectorDescription/DDCMS/plugins/BuildFile.xml b/DetectorDescription/DDCMS/plugins/BuildFile.xml
index 6051339d95a53..1f5ae9d225324 100644
--- a/DetectorDescription/DDCMS/plugins/BuildFile.xml
+++ b/DetectorDescription/DDCMS/plugins/BuildFile.xml
@@ -3,14 +3,13 @@
 <use name="FWCore/ParameterSet"/>
 <use name="dd4hep"/>
 <use name="DetectorDescription/DDCMS"/>
-
-<library name="DetectorDescriptionTestPlugins" file="test/*.cc" >
+<library name="DetectorDescriptionTestPlugins" file="test/*.cc">
   <use name="Geometry/Records"/>
   <lib name="Geom"/>
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<library name="DetectorDescriptionPlugins" file="*.cc" >
+<library name="DetectorDescriptionPlugins" file="*.cc">
   <use name="CondFormats/Common"/>
   <use name="Geometry/Records"/>
   <use name="MagneticField/Records"/>
@@ -18,7 +17,7 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<library name="DetectorDescriptionDD4HepPlugins" file="dd4hep/*.cc" >
+<library name="DetectorDescriptionDD4HepPlugins" file="dd4hep/*.cc">
   <use name="rootgeom"/>
   <flags DD4HEP_PLUGIN="1"/>
 </library>
diff --git a/DetectorDescription/DDCMS/test/BuildFile.xml b/DetectorDescription/DDCMS/test/BuildFile.xml
index ba70fd7bbd379..946faa8763873 100644
--- a/DetectorDescription/DDCMS/test/BuildFile.xml
+++ b/DetectorDescription/DDCMS/test/BuildFile.xml
@@ -1,32 +1,40 @@
-<use   name="cppunit"/>
-<bin   name="testDD4hepFilteredView" file="DDFilteredView.cppunit.cc,testRunner.cpp">
+<use name="cppunit"/>
+<bin name="testDD4hepFilteredView" file="DDFilteredView.cppunit.cc,testRunner.cpp">
   <use name="DetectorDescription/DDCMS"/>
   <use name="dd4hep"/>
 </bin>
-<bin   name="testDD4hepExpandedView" file="DDExpandedView.cppunit.cc,testRunner.cpp">
+
+<bin name="testDD4hepExpandedView" file="DDExpandedView.cppunit.cc,testRunner.cpp">
   <use name="DetectorDescription/DDCMS"/>
   <use name="dd4hep"/>
 </bin>
-<bin   name="testDD4hepCompactView" file="DDCompactView.cppunit.cc,testRunner.cpp">
+
+<bin name="testDD4hepCompactView" file="DDCompactView.cppunit.cc,testRunner.cpp">
   <use name="DetectorDescription/DDCMS"/>
   <use name="dd4hep"/>
 </bin>
-<bin   name="testDD4hepFilter" file="Filter.cppunit.cc,testRunner.cpp">
+
+<bin name="testDD4hepFilter" file="Filter.cppunit.cc,testRunner.cpp">
   <use name="DetectorDescription/DDCMS"/>
 </bin>
-<bin   name="testDD4hepExpandedNodes" file="ExpandedNodes.cppunit.cc,testRunner.cpp">
+
+<bin name="testDD4hepExpandedNodes" file="ExpandedNodes.cppunit.cc,testRunner.cpp">
   <use name="DetectorDescription/DDCMS"/>
 </bin>
-<bin   name="testDD4hepDDSolidShapes" file="DDSolidShapes.cppunit.cc,testRunner.cpp">
+
+<bin name="testDD4hepDDSolidShapes" file="DDSolidShapes.cppunit.cc,testRunner.cpp">
   <use name="DetectorDescription/DDCMS"/>
 </bin>
-<bin   name="testDD4hepDDSolid" file="DDSolid.cppunit.cc,testRunner.cpp">
+
+<bin name="testDD4hepDDSolid" file="DDSolid.cppunit.cc,testRunner.cpp">
   <use name="DetectorDescription/DDCMS"/>
 </bin>
-<bin   name="testDD4hepDDSolidLegacyShapes" file="DDSolidLegacyShapes.cppunit.cc,testRunner.cpp">
+
+<bin name="testDD4hepDDSolidLegacyShapes" file="DDSolidLegacyShapes.cppunit.cc,testRunner.cpp">
   <use name="DetectorDescription/DDCMS"/>
 </bin>
+
 <bin file="dummyMain.cpp" name="DetectorDescriptionDDCMSTestDriver">
-  <use   name="FWCore/Utilities"/>
-  <flags   TEST_RUNNER_ARGS="/bin/bash DetectorDescription/DDCMS/test runTest.sh"/>
+  <use name="FWCore/Utilities"/>
+  <flags TEST_RUNNER_ARGS="/bin/bash DetectorDescription/DDCMS/test runTest.sh"/>
 </bin>
diff --git a/DetectorDescription/OfflineDBLoader/BuildFile.xml b/DetectorDescription/OfflineDBLoader/BuildFile.xml
index 646569f8c993a..d4a2371c79865 100644
--- a/DetectorDescription/OfflineDBLoader/BuildFile.xml
+++ b/DetectorDescription/OfflineDBLoader/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="DetectorDescription/Core"/>
+<use name="DetectorDescription/Core"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DetectorDescription/OfflineDBLoader/plugins/BuildFile.xml b/DetectorDescription/OfflineDBLoader/plugins/BuildFile.xml
index 926df60cc1d23..6efdc50c11b1b 100644
--- a/DetectorDescription/OfflineDBLoader/plugins/BuildFile.xml
+++ b/DetectorDescription/OfflineDBLoader/plugins/BuildFile.xml
@@ -1,9 +1,9 @@
-<library   name="OutputDDToDDL" file="Output*.cc">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="DetectorDescription/Core"/>
-  <use   name="DetectorDescription/OfflineDBLoader"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="Geometry/Records"/>
-  <use   name="MagneticField/Records"/>
+<library name="OutputDDToDDL" file="Output*.cc">
+  <flags EDM_PLUGIN="1"/>
+  <use name="DetectorDescription/Core"/>
+  <use name="DetectorDescription/OfflineDBLoader"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="Geometry/Records"/>
+  <use name="MagneticField/Records"/>
 </library>
diff --git a/DetectorDescription/Parser/BuildFile.xml b/DetectorDescription/Parser/BuildFile.xml
index 86715f616a587..8d6c4d394eee0 100644
--- a/DetectorDescription/Parser/BuildFile.xml
+++ b/DetectorDescription/Parser/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="DetectorDescription/Core"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Utilities/Xerces"/>
-<use   name="boost"/>
-<use   name="clhepheader"/>
-<use   name="rootmath"/>
-<use   name="xerces-c"/>
+<use name="DetectorDescription/Core"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/Utilities"/>
+<use name="Utilities/Xerces"/>
+<use name="boost"/>
+<use name="clhepheader"/>
+<use name="rootmath"/>
+<use name="xerces-c"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DetectorDescription/Parser/test/BuildFile.xml b/DetectorDescription/Parser/test/BuildFile.xml
index 559eed7f33e8a..8a92c9dd9d81d 100644
--- a/DetectorDescription/Parser/test/BuildFile.xml
+++ b/DetectorDescription/Parser/test/BuildFile.xml
@@ -1,13 +1,13 @@
 <bin file="TestIntegration.cpp" name="DetectorDescriptionParserTE">
-   <flags TEST_RUNNER_ARGS=" /bin/bash DetectorDescription/Parser/test run_testDoc.sh" />
-   <use name="FWCore/Utilities"/>
+  <flags TEST_RUNNER_ARGS=" /bin/bash DetectorDescription/Parser/test run_testDoc.sh"/>
+  <use name="FWCore/Utilities"/>
 </bin>
 
 <bin name="testmat" file="testmat.cpp">
- <use name="DetectorDescription/Parser"/>
- <use name="FWCore/MessageLogger"/>
- <use name="FWCore/ParameterSetReader"/>
- <use name="FWCore/PluginManager"/>
- <use name="FWCore/ServiceRegistry"/>
- <use name="FWCore/Utilities"/>
+  <use name="DetectorDescription/Parser"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSetReader"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Utilities"/>
 </bin>
diff --git a/DetectorDescription/RegressionTest/BuildFile.xml b/DetectorDescription/RegressionTest/BuildFile.xml
index e520889201655..27eb8a27397ad 100644
--- a/DetectorDescription/RegressionTest/BuildFile.xml
+++ b/DetectorDescription/RegressionTest/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="DetectorDescription/Core"/>
-<use   name="DetectorDescription/Parser"/>
-<use   name="clhep"/>
-<use   name="xerces-c"/>
+<use name="DetectorDescription/Core"/>
+<use name="DetectorDescription/Parser"/>
+<use name="clhep"/>
+<use name="xerces-c"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DetectorDescription/RegressionTest/bin/BuildFile.xml b/DetectorDescription/RegressionTest/bin/BuildFile.xml
index 1eee897b09038..ce8877778f488 100644
--- a/DetectorDescription/RegressionTest/bin/BuildFile.xml
+++ b/DetectorDescription/RegressionTest/bin/BuildFile.xml
@@ -1,8 +1,8 @@
-<bin   file="DOMCount.cpp">
-  <use   name="DetectorDescription/Core"/>
-  <use   name="DetectorDescription/RegressionTest"/>
-  <use   name="DetectorDescription/Parser"/>
-  <use   name="xerces-c"/>
+<bin file="DOMCount.cpp">
+  <use name="DetectorDescription/Core"/>
+  <use name="DetectorDescription/RegressionTest"/>
+  <use name="DetectorDescription/Parser"/>
+  <use name="xerces-c"/>
 </bin>
 
 <bin file="DDErrorReport.cpp">
diff --git a/DetectorDescription/RegressionTest/plugins/BuildFile.xml b/DetectorDescription/RegressionTest/plugins/BuildFile.xml
index c8cc70a5fbe68..c5a05697cb3c6 100644
--- a/DetectorDescription/RegressionTest/plugins/BuildFile.xml
+++ b/DetectorDescription/RegressionTest/plugins/BuildFile.xml
@@ -1,8 +1,8 @@
-<library   name="CompareDDViews" file="Compare*.cc">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="DetectorDescription/Core"/>
-  <use   name="DetectorDescription/Parser"/>
-  <use   name="DetectorDescription/RegressionTest"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
+<library name="CompareDDViews" file="Compare*.cc">
+  <flags EDM_PLUGIN="1"/>
+  <use name="DetectorDescription/Core"/>
+  <use name="DetectorDescription/Parser"/>
+  <use name="DetectorDescription/RegressionTest"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
 </library>
diff --git a/DetectorDescription/RegressionTest/test/BuildFile.xml b/DetectorDescription/RegressionTest/test/BuildFile.xml
index ccbd0347728f6..b332b5d7fe42e 100644
--- a/DetectorDescription/RegressionTest/test/BuildFile.xml
+++ b/DetectorDescription/RegressionTest/test/BuildFile.xml
@@ -8,6 +8,7 @@
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>
 </bin>
+
 <bin file="testDoc.cpp">
   <use name="DetectorDescription/Core"/>
   <use name="DetectorDescription/Parser"/>
@@ -19,6 +20,7 @@
   <use name="FWCore/Utilities"/>
   <use name="Utilities/Xerces"/>
 </bin>
+
 <bin name="dumpDDCompactView" file="dumpDDCompactView.cpp">
   <use name="DetectorDescription/Core"/>
   <use name="DetectorDescription/Parser"/>
@@ -29,11 +31,13 @@
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>
 </bin>
+
 <bin name="testNew" file="testNew.cpp">
   <use name="DetectorDescription/Core"/>
   <use name="DetectorDescription/Parser"/>
   <use name="DetectorDescription/RegressionTest"/>
 </bin>
+
 <bin name="testDDCompactView" file="testDDCompactView.cpp">
   <use name="DetectorDescription/Core"/>
   <use name="DetectorDescription/Parser"/>
@@ -44,9 +48,10 @@
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>
 </bin>
+
 <bin file="TestIntegration.cpp" name="DetectorDescriptionRegressionTestDDErrorReport">
-  <flags TEST_RUNNER_ARGS=" /bin/bash DetectorDescription/RegressionTest/test run_DDErrorReport.sh" />
-  <use   name="FWCore/Utilities" />
+  <flags TEST_RUNNER_ARGS=" /bin/bash DetectorDescription/RegressionTest/test run_DDErrorReport.sh"/>
+  <use name="FWCore/Utilities"/>
 </bin>
 
 <bin file="DDCompareCPV.cpp">
@@ -113,17 +118,17 @@
 </bin>
 
 <bin file="const_dump.cpp">
- <use name="DetectorDescription/Core"/>
- <use name="DetectorDescription/RegressionTest"/>
- <use name="DetectorDescription/Parser"/>
- <use name="xerces-c"/>
- <use name="FWCore/Framework"/>
- <use name="FWCore/Utilities"/>
- <use name="FWCore/PluginManager"/>
- <use name="FWCore/ServiceRegistry"/>
- <use name="FWCore/MessageLogger"/>
-</bin>
-
-<library file="tutorial.cc"  name="DetectorDescriptionTutorial">
+  <use name="DetectorDescription/Core"/>
+  <use name="DetectorDescription/RegressionTest"/>
+  <use name="DetectorDescription/Parser"/>
+  <use name="xerces-c"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/Utilities"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/MessageLogger"/>
+</bin>
+
+<library file="tutorial.cc" name="DetectorDescriptionTutorial">
   <use name="DetectorDescription/RegressionTest"/>
 </library>