Skip to content

Commit

Permalink
Merge pull request #29660 from fwyzard/branch_lintBuildFile_CondTools
Browse files Browse the repository at this point in the history
Clean up BuildFiles under CondTools/
  • Loading branch information
cmsbuild committed May 6, 2020
2 parents 0d7a8d3 + 449a297 commit 50066e0
Show file tree
Hide file tree
Showing 37 changed files with 416 additions and 405 deletions.
13 changes: 6 additions & 7 deletions CondTools/BTau/BuildFile.xml
@@ -1,9 +1,8 @@
<use name="FWCore/PluginManager"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="CondFormats/BTauObjects"/>

<use name="FWCore/PluginManager"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="CondFormats/BTauObjects"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
29 changes: 15 additions & 14 deletions CondTools/BTau/plugins/BuildFile.xml
@@ -1,15 +1,16 @@
<export></export>
<library name="CondToolsBTauplugins" file="*.cc">
<use name="CondFormats/PhysicsToolsObjects"/>
<use name="CondFormats/BTauObjects"/>
<use name="CondFormats/DataRecord"/>
<use name="CondTools/BTau"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="CondCore/DBOutputService"/>
<use name="PhysicsTools/CondLiteIO"/>
<use name="PhysicsTools/UtilAlgos"/>
<export>
</export>
<library name="CondToolsBTauplugins" file="*.cc">
<use name="CondFormats/PhysicsToolsObjects"/>
<use name="CondFormats/BTauObjects"/>
<use name="CondFormats/DataRecord"/>
<use name="CondTools/BTau"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="CondCore/DBOutputService"/>
<use name="PhysicsTools/CondLiteIO"/>
<use name="PhysicsTools/UtilAlgos"/>
</library>
3 changes: 1 addition & 2 deletions CondTools/BTau/test/BuildFile.xml
@@ -1,5 +1,4 @@
<use name="CondFormats/BTauObjects"/>

<bin file="testBTagCalibrationReader.cpp">
<use name="CondTools/BTau"/>
<use name="CondTools/BTau"/>
</bin>
18 changes: 9 additions & 9 deletions CondTools/CTPPS/BuildFile.xml
@@ -1,10 +1,10 @@
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/PPSObjects"/>
<use name="CondCore/DBOutputService"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="root"/>
<use name="rootcore"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/PPSObjects"/>
<use name="CondCore/DBOutputService"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="root"/>
<use name="rootcore"/>
<flags EDM_PLUGIN="1"/>
26 changes: 13 additions & 13 deletions CondTools/CTPPS/plugins/BuildFile.xml
@@ -1,13 +1,13 @@
<use name="CondFormats/PPSObjects"/>
<use name="CondCore/PopCon"/>
<use name="CondCore/CondDB"/>
<use name="CondCore/DBOutputService"/>
<use name="FWCore/Framework"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/MessageLogger"/>
<use name="CondFormats/DataRecord"/>
<use name="root"/>
<use name="rootcore"/>
<flags EDM_PLUGIN="1"/>
<use name="CondFormats/PPSObjects"/>
<use name="CondCore/PopCon"/>
<use name="CondCore/CondDB"/>
<use name="CondCore/DBOutputService"/>
<use name="FWCore/Framework"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/MessageLogger"/>
<use name="CondFormats/DataRecord"/>
<use name="root"/>
<use name="rootcore"/>
<flags EDM_PLUGIN="1"/>
21 changes: 10 additions & 11 deletions CondTools/DQM/BuildFile.xml
@@ -1,13 +1,12 @@
<use name="CondCore/CondDB"/>
<use name="CondFormats/Common"/>
<use name="CondFormats/DQMObjects"/>
<use name="CoralBase"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="RelationalAccess"/>

<use name="CondCore/CondDB"/>
<use name="CondFormats/Common"/>
<use name="CondFormats/DQMObjects"/>
<use name="CoralBase"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="RelationalAccess"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
61 changes: 33 additions & 28 deletions CondTools/DQM/plugins/BuildFile.xml
@@ -1,34 +1,39 @@
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<library file="DQMSummaryPopConAnalyzer.cc" name="CondToolsDQMSummaryPopConAnalyzer">
<use name="CondCore/PopCon"/>
<use name="CondTools/DQM"/>
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<library file="DQMSummaryPopConAnalyzer.cc" name="CondToolsDQMSummaryPopConAnalyzer">
<use name="CondCore/PopCon"/>
<use name="CondTools/DQM"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="DQMSummaryEventSetupAnalyzer.cc" name="CondToolsDQMSummaryEventSetupAnalyzer">
<use name="CondFormats/DQMObjects"/>
<use name="CondFormats/DataRecord"/>
<flags EDM_PLUGIN="1"/>

<library file="DQMSummaryEventSetupAnalyzer.cc" name="CondToolsDQMSummaryEventSetupAnalyzer">
<use name="CondFormats/DQMObjects"/>
<use name="CondFormats/DataRecord"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="DQMReferenceHistogramRootFilePopConAnalyzer.cc" name="CondToolsDQMReferenceHistogramRootFilePopConAnalyzer">
<use name="CondCore/PopCon"/>
<use name="CondTools/DQM"/>
<flags EDM_PLUGIN="1"/>

<library file="DQMReferenceHistogramRootFilePopConAnalyzer.cc" name="CondToolsDQMReferenceHistogramRootFilePopConAnalyzer">
<use name="CondCore/PopCon"/>
<use name="CondTools/DQM"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="DQMReferenceHistogramRootFileEventSetupAnalyzer.cc" name="CondToolsDQMReferenceHistogramRootFileEventSetupAnalyzer">
<use name="CondFormats/DataRecord"/>
<use name="DQMServices/Core"/>
<use name="CondFormats/Common"/>
<flags EDM_PLUGIN="1"/>

<library file="DQMReferenceHistogramRootFileEventSetupAnalyzer.cc" name="CondToolsDQMReferenceHistogramRootFileEventSetupAnalyzer">
<use name="CondFormats/DataRecord"/>
<use name="DQMServices/Core"/>
<use name="CondFormats/Common"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="DQMXMLFilePopConAnalyzer.cc" name="CondToolsDQMXMLFilePopConAnalyzer">
<use name="CondCore/PopCon"/>
<use name="CondTools/DQM"/>
<flags EDM_PLUGIN="1"/>

<library file="DQMXMLFilePopConAnalyzer.cc" name="CondToolsDQMXMLFilePopConAnalyzer">
<use name="CondCore/PopCon"/>
<use name="CondTools/DQM"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="DQMXMLFileEventSetupAnalyzer.cc" name="CondToolsDQMXMLFileEventSetupAnalyzer">
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/Common"/>
<use name="DQMServices/Core"/>
<flags EDM_PLUGIN="1"/>

<library file="DQMXMLFileEventSetupAnalyzer.cc" name="CondToolsDQMXMLFileEventSetupAnalyzer">
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/Common"/>
<use name="DQMServices/Core"/>
<flags EDM_PLUGIN="1"/>
</library>
21 changes: 10 additions & 11 deletions CondTools/DT/BuildFile.xml
@@ -1,13 +1,12 @@
<use name="CondCore/CondDB"/>
<use name="CondFormats/DTObjects"/>
<use name="CondFormats/DataRecord"/>
<use name="CoralBase"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="CondCore/DBOutputService"/>
<use name="RelationalAccess"/>

<use name="CondCore/CondDB"/>
<use name="CondFormats/DTObjects"/>
<use name="CondFormats/DataRecord"/>
<use name="CoralBase"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="CondCore/DBOutputService"/>
<use name="RelationalAccess"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
24 changes: 12 additions & 12 deletions CondTools/DT/plugins/BuildFile.xml
@@ -1,13 +1,13 @@
<use name="CondTools/DT"/>
<use name="CondCore/DBOutputService"/>
<use name="CondCore/PopCon"/>
<use name="CondFormats/DTObjects"/>
<use name="CoralBase"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="RelationalAccess"/>
<library file="*.cc" name="CondToolsDTP">
<flags EDM_PLUGIN="1"/>
<use name="CondTools/DT"/>
<use name="CondCore/DBOutputService"/>
<use name="CondCore/PopCon"/>
<use name="CondFormats/DTObjects"/>
<use name="CoralBase"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="RelationalAccess"/>
<library file="*.cc" name="CondToolsDTP">
<flags EDM_PLUGIN="1"/>
</library>
31 changes: 16 additions & 15 deletions CondTools/DT/test/BuildFile.xml
@@ -1,17 +1,18 @@
<use name="clhep"/>
<use name="FWCore/ParameterSet"/>
<use name="CondFormats/DTObjects"/>
<use name="FWCore/Framework"/>
<use name="Geometry/Records"/>
<use name="CondFormats/DataRecord"/>
<use name="DataFormats/MuonDetId"/>
<library file="stubs/*.cc" name="CondToolsDTTest">
<use name="CondTools/DT"/>
<use name="Geometry/DTGeometry"/>
<use name="CondCore/DBOutputService"/>
<flags EDM_PLUGIN="1"/>
<use name="clhep"/>
<use name="FWCore/ParameterSet"/>
<use name="CondFormats/DTObjects"/>
<use name="FWCore/Framework"/>
<use name="Geometry/Records"/>
<use name="CondFormats/DataRecord"/>
<use name="DataFormats/MuonDetId"/>
<library file="stubs/*.cc" name="CondToolsDTTest">
<use name="CondTools/DT"/>
<use name="Geometry/DTGeometry"/>
<use name="CondCore/DBOutputService"/>
<flags EDM_PLUGIN="1"/>
</library>
<library file="validate/*.cc" name="CondToolsDTValidate">
<use name="CondCore/PopCon"/>
<flags EDM_PLUGIN="1"/>

<library file="validate/*.cc" name="CondToolsDTValidate">
<use name="CondCore/PopCon"/>
<flags EDM_PLUGIN="1"/>
</library>
52 changes: 26 additions & 26 deletions CondTools/Ecal/BuildFile.xml
@@ -1,28 +1,28 @@
<use name="CondCore/DBOutputService"/>
<use name="CondCore/PopCon"/>
<use name="CondFormats/Alignment"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/EcalObjects"/>
<use name="CondFormats/ESObjects"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/EcalDetId"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="Utilities/Xerces"/>
<use name="OnlineDB/EcalCondDB"/>
<use name="OnlineDB/Oracle"/>
<use name="SimCalorimetry/EcalSelectiveReadoutProducers"/>
<use name="Geometry/EcalMapping"/>
<use name="CalibCalorimetry/EcalLaserCorrection"/>
<use name="root"/>
<use name="rootcore"/>
<use name="rootphysics"/>
<use name="rootgraphics"/>
<use name="boost"/>
<use name="CondCore/DBOutputService"/>
<use name="CondCore/PopCon"/>
<use name="CondFormats/Alignment"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/EcalObjects"/>
<use name="CondFormats/ESObjects"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/EcalDetId"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="Utilities/Xerces"/>
<use name="OnlineDB/EcalCondDB"/>
<use name="OnlineDB/Oracle"/>
<use name="SimCalorimetry/EcalSelectiveReadoutProducers"/>
<use name="Geometry/EcalMapping"/>
<use name="CalibCalorimetry/EcalLaserCorrection"/>
<use name="root"/>
<use name="rootcore"/>
<use name="rootphysics"/>
<use name="rootgraphics"/>
<use name="boost"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
10 changes: 4 additions & 6 deletions CondTools/Ecal/bin/BuildFile.xml
@@ -1,7 +1,5 @@


<bin name="array2xmlEB" file="array2xmlEB.cc" >
<use name="CondTools/Ecal" />
<use name="CondFormats/EcalObjects" />
<use name="DataFormats/EcalDetId" />
<bin name="array2xmlEB" file="array2xmlEB.cc">
<use name="CondTools/Ecal"/>
<use name="CondFormats/EcalObjects"/>
<use name="DataFormats/EcalDetId"/>
</bin>
34 changes: 17 additions & 17 deletions CondTools/Ecal/plugins/BuildFile.xml
@@ -1,18 +1,18 @@
<use name="boost"/>
<use name="xerces-c"/>
<use name="CondFormats/Alignment"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/EcalObjects"/>
<use name="CondFormats/RunInfo"/>
<use name="CondCore/DBOutputService"/>
<use name="CondCore/PopCon"/>
<use name="CondTools/Ecal"/>
<use name="CondTools/RunInfo"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/EcalDetId"/>
<use name="FWCore/Framework"/>
<use name="FWCore/PluginManager"/>
<use name="Utilities/General"/>
<library file="*.cc" name="CondToolsEcalPlugin">
<flags EDM_PLUGIN="1"/>
<use name="boost"/>
<use name="xerces-c"/>
<use name="CondFormats/Alignment"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/EcalObjects"/>
<use name="CondFormats/RunInfo"/>
<use name="CondCore/DBOutputService"/>
<use name="CondCore/PopCon"/>
<use name="CondTools/Ecal"/>
<use name="CondTools/RunInfo"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/EcalDetId"/>
<use name="FWCore/Framework"/>
<use name="FWCore/PluginManager"/>
<use name="Utilities/General"/>
<library file="*.cc" name="CondToolsEcalPlugin">
<flags EDM_PLUGIN="1"/>
</library>
1 change: 0 additions & 1 deletion CondTools/Ecal/test/BuildFile.xml
@@ -1,5 +1,4 @@
<use name="CondTools/Ecal"/>

<architecture name="(slc|cc).*_amd64_.*">
<ifcxx11_abi value="1">
<flags SETENV="LD_PRELOAD=$(CMS_ORACLEOCCI_LIB)"/>
Expand Down

0 comments on commit 50066e0

Please sign in to comment.