Skip to content

Clean BuildFiles, fix typo and add source_only flags to fix warnings #33143

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

Merged
cmsbuild merged 1 commit into from
Mar 16, 2021
Merged

Clean BuildFiles, fix typo and add source_only flags to fix warnings #33143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CalibMuon/DTCalibration/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<use name="root"/>
<use name="rootmath"/>
<use name="rootcore"/>
<use name="rootfitcore"/>
<use name="roofitcore"/>
<use name="rootgraphics"/>
<lib name="Spectrum"/>
<library file="*.cc" name="CalibMuonDTCalibrationPlugins">
Expand Down
1 change: 0 additions & 1 deletion DQM/GEM/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<use name="FWCore/Utilities"/>
<use name="DQMServices/Core"/>
<use name="DataFormats/GEMDigi"/>
<use name="DataFormats/GEMRecHit"/>
<use name="Geometry/Records"/>
<use name="Geometry/GEMGeometry"/>
<use name="Validation/MuonGEMHits"/>
Expand Down
2 changes: 0 additions & 2 deletions DQM/GEM/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@
<use name="DQMServices/Core"/>
<use name="DataFormats/GEMDigi"/>
<use name="DataFormats/GEMRecHit"/>
<use name="Geometry/Records"/>
<use name="Geometry/GEMGeometry"/>
<use name="Validation/MuonGEMHits"/>
</library>
2 changes: 0 additions & 2 deletions DQM/SiStripMonitorSummary/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
<use name="DataFormats/SiStripDetId"/>
<use name="CalibTracker/Records"/>
<use name="CommonTools/TrackerMap"/>
<use name="DQM/SiStripCommon"/>
<use name="DQM/SiStripMonitorSummary"/>
<use name="DQMServices/Core"/>
<library file="*.cc" name="DQMSiStripMonitorSummaryplugins">
<flags EDM_PLUGIN="1"/>
</library>
2 changes: 1 addition & 1 deletion DataFormats/DTDigi/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/MuonDetId"/>
<use name="DataFormats/FEDRawData"/>
<use name="DataFormats/MuonData"/>
<use name="DataFormats/MuonData" source_only="1"/>
<use name="FWCore/Utilities"/>
<export>
<lib name="1"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/HLTReco/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<use name="DataFormats/TauReco"/>
<use name="DataFormats/L1TParticleFlow"/>
<use name="DataFormats/L1TCorrelator"/>
<use name="FWCore/MessageLogger"/>
<use name="DataFormats/GsfTrackReco"/>
<export>
<lib name="1"/>
Expand Down
1 change: 0 additions & 1 deletion GeneratorInterface/LHEInterface/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<use name="stdcxx-fs"/>
<library name="GeneratorInterfaceLHEProducer" file="LHEFilter.cc LHE2HepMCConverter.cc ExternalLHEProducer.cc ExternalLHEAsciiDumper.cc">
<use name="FWCore/Framework"/>
<use name="FWCore/Concurrency"/>
<use name="SimDataFormats/GeneratorProducts"/>
<flags EDM_PLUGIN="1"/>
</library>
Expand Down
1 change: 0 additions & 1 deletion Geometry/VeryForwardGeometry/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<export>
<lib name="1"/>
</export>
<use name="CondFormats/PPSObjects"/>
<use name="hepmc"/>
<use name="heppdt"/>
1 change: 0 additions & 1 deletion L1Trigger/L1CaloTrigger/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<use name="FWCore/ParameterSet"/>
<use name="DataFormats/L1TCalorimeterPhase2"/>
<use name="clhep"/>

<export>
Expand Down
1 change: 1 addition & 0 deletions L1Trigger/L1CaloTrigger/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<use name="Geometry/CaloGeometry"/>
<use name="Geometry/HcalTowerAlgo"/>
<use name="Geometry/EcalAlgo"/>
<use name="DataFormats/L1TCalorimeterPhase2"/>
<use name="DataFormats/L1Trigger"/>
<use name="DataFormats/HcalDetId"/>
<use name="DataFormats/EcalDigi"/>
Expand Down
1 change: 0 additions & 1 deletion RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="HeterogeneousCore/CUDACore"/>
<use name="RecoLocalTracker/SiPixelClusterizer"/>
<use name="RecoTracker/Record"/>
<library file="*.cc *.cu" name="RecoLocalTrackerSiPixelClusterizerPlugins">
<flags EDM_PLUGIN="1"/>
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<use name="MagneticField/UniformEngine"/>
<use name="RecoTracker/MeasurementDet"/>
<use name="RecoTracker/Record"/>
<use name="RecoTracker/SpecialSeedGenerators"/>
<use name="RecoTracker/SpecialSeedGenerators" source_only="1"/>
Copy link
Contributor

@perrotta perrotta Mar 11, 2021

Choose a reason for hiding this comment

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

(Trying to assimilate the usage od the source_only flag in the BuildFile's, I looked around for "RecoTracker/SpecialSeedGenerators"): shouldn't you have one such declaration also in RecoTracker/​ConversionSeedGenerators/​plugins/​BuildFile.xml?

Copy link
Contributor

@fwyzard fwyzard Mar 11, 2021

Choose a reason for hiding this comment

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

What does source_only="1" do ?

Copy link
Contributor Author

@guitargeek guitargeek Mar 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

From #31459 (comment) I understood that the source_only flag makes sense if you depend on a CMSSW package that is source only, but it still has a BuildFile which is useful to inherit dependencies from.

However, I fix here some warnings that arise when a source-only package has no BuildFile. So for this cases, the use name line with source_only actually does nothing currently. But if in the future those source-only packages will get a BuildFile, we can profit from it. So adding the source_only flag appears to be more future-proof than dropping the line.

Still, I also think that this argument is not that important that we need to preemptively add lines with source_only if there is no warning or other inconsistency.

<use name="RecoTracker/TkHitPairs"/>
<use name="RecoTracker/TkSeedingLayers"/>
<use name="RecoTracker/TransientTrackingRecHit"/>
Expand Down
1 change: 0 additions & 1 deletion SimDataFormats/CrossingFrame/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="SimDataFormats/CaloHit"/>
<use name="SimDataFormats/EncodedEventId"/>
Expand Down
2 changes: 1 addition & 1 deletion SimDataFormats/DigiSimLinks/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<use name="DataFormats/Common"/>
<use name="SimDataFormats/EncodedEventId"/>
<use name="DataFormats/MuonDetId"/>
<use name="DataFormats/MuonData"/>
<use name="DataFormats/MuonData" source_only="1"/>
<use name="boost"/>
<export>
<lib name="1"/>
Expand Down
1 change: 0 additions & 1 deletion SimPPS/PPSPixelDigiProducer/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<use name="CondFormats/PPSObjects"/>
<use name="DataFormats/CTPPSDigi"/>
<use name="FWCore/ParameterSet"/>
<use name="Geometry/VeryForwardGeometry"/>
<use name="SimTracker/Common"/>
<export>
<lib name="1"/>
Expand Down