Skip to content

Commit

Permalink
Clean up BuildFiles under DetectorDescription/
Browse files Browse the repository at this point in the history 
Clean up BuildFile.xml filea with `xmllint --format`.
  • Loading branch information
@fwyzard
fwyzard committed May 5, 2020
1 parent b5b4bf2 commit a3cda8a
Show file tree
Hide file tree
Showing 14 changed files with 124 additions and 106 deletions.
14 changes: 7 additions & 7 deletions DetectorDescription/Core/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions DetectorDescription/Core/plugins/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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"/>
35 changes: 21 additions & 14 deletions DetectorDescription/Core/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
17 changes: 8 additions & 9 deletions DetectorDescription/DDCMS/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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>

7 changes: 3 additions & 4 deletions DetectorDescription/DDCMS/plugins/BuildFile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,21 @@
<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"/>
<lib name="Geom"/>
<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>
30 changes: 19 additions & 11 deletions DetectorDescription/DDCMS/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions DetectorDescription/OfflineDBLoader/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<use name="DetectorDescription/Core"/>
<use name="DetectorDescription/Core"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
16 changes: 8 additions & 8 deletions DetectorDescription/OfflineDBLoader/plugins/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
20 changes: 10 additions & 10 deletions DetectorDescription/Parser/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
16 changes: 8 additions & 8 deletions DetectorDescription/Parser/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
10 changes: 5 additions & 5 deletions DetectorDescription/RegressionTest/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
10 changes: 5 additions & 5 deletions DetectorDescription/RegressionTest/bin/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
14 changes: 7 additions & 7 deletions DetectorDescription/RegressionTest/plugins/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
33 changes: 19 additions & 14 deletions DetectorDescription/RegressionTest/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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">
Expand Down Expand Up @@ -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>

0 comments on commit a3cda8a

Please sign in to comment.