Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean BuildFiles in DataFormats #31459

Merged
merged 2 commits into from Sep 19, 2020
Merged

Clean BuildFiles in DataFormats #31459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8712139
clean BuildFiles in DataFromats
guitargeek Sep 14, 2020
4ec3123
use source_only when requiring FWCore/SOA
guitargeek Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CommonTools/Utils/BuildFile.xml
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
<use name="DataFormats/Math"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Reflection"/>
<use name="FWCore/SOA"/>
<use name="FWCore/SOA" source_only="1"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smuzaffar I get the following complaint from scram in CMSSW_11_2_X_2020-09-18-1100

****WARNING: Invalid tool FWCore/SOA. Please fix src/CommonTools/Utils/BuildFile.xml file.

Are we missing something more?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you get this in latest IB?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, in CMSSW_11_2_X_2020-09-22-1100 there is no such complaint. Thanks!

<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="boost"/>
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/CSCDigi/test/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,4 @@
<use name="FWCore/Framework"/>
<use name="DataFormats/CSCDigi"/>
<use name="DataFormats/DetId"/>
<bin name="testCSCDigis" file="testCSCDigis.cpp">
<use name="cppunit"/>
<use name="DataFormats/FEDRawData"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/CSCRecHit/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,5 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/MuonDetId"/>
<use name="DataFormats/GeometryVector"/>
<use name="DataFormats/TrackingRecHit"/>
<export>
<lib name="1"/>
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/CSCRecHit/test/BuildFile.xml
View file
Open in desktop
@@ -1,5 +1,4 @@
<use name="FWCore/Framework"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ParameterSet"/>
<use name="DataFormats/MuonReco"/>
<use name="DataFormats/CSCRecHit"/>
Expand All @@ -8,7 +7,6 @@
<use name="CommonTools/UtilAlgos"/>
<use name="FWCore/ServiceRegistry"/>
<use name="root"/>
<use name="DataFormats/GeometryVector"/>
<library file="CSCSharesInputTest.cc" name="CSCSharesInputTest">
<flags EDM_PLUGIN="1"/>
</library>
3 changes: 1 addition & 2 deletions DataFormats/CTPPSDigi/BuildFile.xml
View file
Open in desktop
@@ -1,5 +1,4 @@
<use name="FWCore/Framework"/>
<use name="DataFormats/CTPPSDetId"/>
<use name="DataFormats/Common"/>
<export>
<lib name="1"/>
</export>
1 change: 0 additions & 1 deletion DataFormats/CaloTowers/test/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,5 @@
<use name="DataFormats/CaloTowers"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<library file="CaloTowersDump.cc" name="CaloTowersDump">
<flags EDM_PLUGIN="1"/>
</library>
1 change: 0 additions & 1 deletion DataFormats/Common/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,6 @@
<use name="DataFormats/Provenance"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="DataFormats/StdDictionaries"/>
<use name="boost"/>
<export>
<lib name="1"/>
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/Common/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -11,8 +11,6 @@
</bin>

<bin file="DictionaryTools_t.cpp">
<use name="DataFormats/StdDictionaries"/>
<use name="DataFormats/WrappedStdDictionaries"/>
</bin>

<bin file="Wrapper_t.cpp">
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/DTDigi/test/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,5 @@
<use name="FWCore/Framework"/>
<use name="DataFormats/DTDigi"/>
<use name="DataFormats/DetId"/>
<bin name="testDTDigis" file="testDTDigis.cpp">
<use name="cppunit"/>
<use name="DataFormats/FEDRawData"/>
</bin>
1 change: 0 additions & 1 deletion DataFormats/GEMRecHit/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,6 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/MuonDetId"/>
<use name="DataFormats/TrackingRecHit"/>
<use name="DataFormats/GeometryVector"/>
<use name="DataFormats/CSCRecHit"/>
<use name="rootrflx"/>
<export>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/HLTReco/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,5 @@
<use name="FWCore/Utilities"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/CLHEP"/>
<use name="DataFormats/Candidate"/>
<use name="DataFormats/L1Trigger"/>
<use name="DataFormats/RecoCandidate"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/HcalDigi/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/HcalDigi"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
</library>

<iftool name="cuda-gcc-support">
Expand Down
1 change: 0 additions & 1 deletion DataFormats/HcalIsolatedTrack/BuildFile.xml
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@
<use name="DataFormats/RecoCandidate"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/L1Trigger"/>
<use name="FWCore/MessageLogger"/>
<export>
<lib name="1"/>
</export>
3 changes: 0 additions & 3 deletions DataFormats/HcalRecHit/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -8,10 +8,7 @@
<iftool name="cuda-gcc-support">
<bin name="test_hcal_reco" file="test_hcal_reco.cu">
<use name="cuda"/>
<use name="DataFormats/CaloRecHit"/>
<use name="DataFormats/HcalRecHit"/>
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/HcalDigi"/>
<use name="HeterogeneousCore/CUDAUtilities"/>
</bin>
</iftool>
2 changes: 0 additions & 2 deletions DataFormats/HeavyIonEvent/BuildFile.xml
View file
Open in desktop
@@ -1,8 +1,6 @@
<use name="root"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Candidate"/>
<use name="CondFormats/HIObjects"/>
<use name="CondFormats/DataRecord"/>
<export>
<lib name="1"/>
</export>
1 change: 0 additions & 1 deletion DataFormats/HepMCCandidate/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,5 @@
<use name="DataFormats/Candidate"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/StdDictionaries"/>
<use name="root"/>
<export>
<lib name="1"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/METReco/BuildFile.xml
View file
Open in desktop
Expand Up @@ -3,7 +3,6 @@
<use name="DataFormats/JetReco"/>
<use name="DataFormats/EcalRecHit"/>
<use name="DataFormats/HcalRecHit"/>
<use name="FWCore/Utilities"/>
<use name="root"/>
<export>
<lib name="1"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/MuonSeed/BuildFile.xml
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/L1Trigger"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/TrackingRecHit"/>
<export>
<lib name="1"/>
</export>
2 changes: 0 additions & 2 deletions DataFormats/NanoAOD/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,5 @@
<use name="FWCore/Utilities"/>
<use name="FWCore/Common"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/StdDictionaries"/>
<use name="DataFormats/Math"/>
<use name="boost"/>
<export>
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/ParticleFlowCandidate/BuildFile.xml
View file
Open in desktop
Expand Up @@ -5,8 +5,6 @@
<use name="DataFormats/Math"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/GsfTrackReco"/>
<use name="DataFormats/DTRecHit"/>
<use name="DataFormats/CSCRecHit"/>
<use name="DataFormats/MuonReco"/>
<use name="FWCore/Utilities"/>
<use name="rootcore"/>
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/ParticleFlowReco/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,5 @@
<use name="DataFormats/CaloRecHit"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/EgammaCandidates "/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi @guitargeek - I don't understand this change. DataFormats/EgammaCandidates is used in 3 headers (all of which are then needed to build srcs in this package.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello! My script is grepping for the exact dependency name, which was here "DataFormats/EgammaCandidates " with a whitespace in the end. By eye this whitespace is not so easy to see when scrolling through the diffs, so I was not prepared for this problem.

I'll make sure to strip the witespaces before grepping next time!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah..I also missed the whitespace.. that explains it:) Thanks.

<use name="DataFormats/EgammaReco "/>
<use name="DataFormats/MuonReco"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/TrajectorySeed"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/PatCandidates/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,6 @@
<use name="FWCore/Utilities"/>
<use name="FWCore/Common"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/StdDictionaries"/>
<use name="DataFormats/Candidate"/>
<use name="DataFormats/MuonReco"/>
<use name="DataFormats/TauReco"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/ProtonReco/BuildFile.xml
View file
Open in desktop
@@ -1,5 +1,4 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/CTPPSReco"/>
<export>
<lib name="1"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/RecoCandidate/BuildFile.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@
<use name="DataFormats/GsfTrackReco"/>
<use name="DataFormats/HcalRecHit"/>
<use name="clhep"/>
<use name="SimDataFormats/GeneratorProducts"/>
<use name="SimDataFormats/TrackingAnalysis"/>
<export>
<lib name="1"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/Scouting/BuildFile.xml
View file
Open in desktop
@@ -1,4 +1,3 @@
<use name="FWCore/Utilities"/>
<use name="DataFormats/Common"/>
<export>
<lib name="1"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/Streamer/BuildFile.xml
View file
Open in desktop
@@ -1,5 +1,4 @@
<use name="DataFormats/Provenance"/>
<use name="DataFormats/StdDictionaries"/>
<export>
<lib name="1"/>
</export>
2 changes: 0 additions & 2 deletions DataFormats/TestObjects/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -2,6 +2,4 @@
<use name="DataFormats/TestObjects"/>
<bin file="Enum_t.cpp">
<use name="FWCore/Reflection"/>
<use name="DataFormats/StdDictionaries"/>
<use name="DataFormats/WrappedStdDictionaries"/>
</bin>
3 changes: 0 additions & 3 deletions DataFormats/TrajectorySeed/BuildFile.xml
View file
Open in desktop
@@ -1,11 +1,8 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/CLHEP"/>
<use name="DataFormats/TrajectoryState"/>
<use name="DataFormats/SiStripDetId"/>
<use name="DataFormats/SiPixelDetId"/>
<use name="DataFormats/TrackingRecHit"/>
<use name="FWCore/Utilities"/>
<use name="Geometry/CommonDetUnit"/>
<use name="clhepheader"/>
<export>
<lib name="1"/>
Expand Down
4 changes: 0 additions & 4 deletions DataFormats/V0Candidate/BuildFile.xml
View file
Open in desktop
@@ -1,9 +1,5 @@
<use name="DataFormats/CaloRecHit"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Math"/>
<use name="DataFormats/Candidate"/>
<use name="DataFormats/VertexReco"/>
<use name="FWCore/Utilities"/>
<export>
<lib name="1"/>
</export>
1 change: 0 additions & 1 deletion DataFormats/VertexReco/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,5 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/TrackReco"/>
<use name="FWCore/Utilities"/>
<export>
<lib name="1"/>
</export>
1 change: 1 addition & 0 deletions RecoHI/HiEvtPlaneAlgos/BuildFile.xml
View file
Open in desktop
Expand Up @@ -11,4 +11,5 @@
<use name="DataFormats/CaloTowers"/>
<use name="CondCore/DBOutputService"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/HIObjects"/>
<flags EDM_PLUGIN="1"/>
1 change: 1 addition & 0 deletions RecoHI/HiJetAlgos/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
<use name="RecoHI/HiJetAlgos"/>
<use name="DataFormats/JetReco"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/HIObjects"/>
<use name="CondCore/DBOutputService"/>
<flags EDM_PLUGIN="1"/>
<library file="*.cc" name="HiJetAlgosPlugins">
Expand Down