Skip to content

Commit

Permalink
Clean up BuildFiles under IOPool/
Browse files Browse the repository at this point in the history
Clean up BuildFile.xml filea with `xmllint --format`.
  • Loading branch information
fwyzard committed May 5, 2020
1 parent b5b4bf2 commit b90bbec
Show file tree
Hide file tree
Showing 16 changed files with 178 additions and 158 deletions.
6 changes: 3 additions & 3 deletions IOPool/Common/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
64 changes: 33 additions & 31 deletions IOPool/Common/bin/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
<bin name="edmProvDump" file="EdmProvDump.cc,">
<use name="boost_program_options"/>
<use name="rootcore"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Services"/>
<use name="FWCore/Utilities"/>
<use name="DataFormats/StdDictionaries"/>
<use name="DataFormats/WrappedStdDictionaries"/>
<bin name="edmProvDump" file="EdmProvDump.cc,">
<use name="boost_program_options"/>
<use name="rootcore"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Services"/>
<use name="FWCore/Utilities"/>
<use name="DataFormats/StdDictionaries"/>
<use name="DataFormats/WrappedStdDictionaries"/>
</bin>
<bin name="edmFileUtil" file="EdmFileUtil.cpp,CollUtil.cc">
<use name="boost"/>
<use name="boost_program_options"/>
<use name="rootcore"/>
<use name="roothistmatrix"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Services"/>

<bin name="edmFileUtil" file="EdmFileUtil.cpp,CollUtil.cc">
<use name="boost"/>
<use name="boost_program_options"/>
<use name="rootcore"/>
<use name="roothistmatrix"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Services"/>
</bin>
<bin name="edmCopyUtil" file="EdmCopyUtil.cpp">
<use name="boost"/>
<use name="boost_program_options"/>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Services"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/ParameterSet"/>

<bin name="edmCopyUtil" file="EdmCopyUtil.cpp">
<use name="boost"/>
<use name="boost_program_options"/>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Services"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/ParameterSet"/>
</bin>
14 changes: 8 additions & 6 deletions IOPool/Common/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<environment>
<bin file="TestIOPoolCommon.cpp" name="TestEdmFastMerge">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test TestEdmFastMerge.sh"/>
<use name="FWCore/Utilities"/>
<bin file="TestIOPoolCommon.cpp" name="TestEdmFastMerge">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test TestEdmFastMerge.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<bin file="TestIOPoolCommon.cpp" name="TestEdmConfigDump">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test run_TestEdmConfigDump.sh"/>
<use name="FWCore/Utilities"/>

<bin file="TestIOPoolCommon.cpp" name="TestEdmConfigDump">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test run_TestEdmConfigDump.sh"/>
<use name="FWCore/Utilities"/>
</bin>

</environment>
28 changes: 14 additions & 14 deletions IOPool/Input/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Sources"/>
<use name="FWCore/Utilities"/>
<use name="IOPool/Common"/>
<use name="Utilities/StorageFactory"/>
<use name="clhep"/>
<use name="rootcore"/>
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Sources"/>
<use name="FWCore/Utilities"/>
<use name="IOPool/Common"/>
<use name="Utilities/StorageFactory"/>
<use name="clhep"/>
<use name="rootcore"/>
<flags EDM_PLUGIN="1"/>
12 changes: 7 additions & 5 deletions IOPool/Input/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<environment>
<bin file="TestPoolInput.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Input/test TestPoolInput.sh"/>
<use name="FWCore/Utilities"/>
<bin file="TestPoolInput.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Input/test TestPoolInput.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<library file="IOExerciser.cc" name="IOExerciser">
<flags EDM_PLUGIN="1"/>

<library file="IOExerciser.cc" name="IOExerciser">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ParameterSet"/>
</library>

</environment>
24 changes: 12 additions & 12 deletions IOPool/Output/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Version"/>
<use name="IOPool/Common"/>
<use name="IOPool/Provenance"/>
<use name="rootcore"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Version"/>
<use name="IOPool/Common"/>
<use name="IOPool/Provenance"/>
<use name="rootcore"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
6 changes: 3 additions & 3 deletions IOPool/Output/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<use name="IOPool/Output"/>
<library file="Module.cc" name="IOPoolOutputPlugins">
<flags EDM_PLUGIN="1"/>
<use name="IOPool/Output"/>
<library file="Module.cc" name="IOPoolOutputPlugins">
<flags EDM_PLUGIN="1"/>
</library>
7 changes: 4 additions & 3 deletions IOPool/Output/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<environment>
<bin file="TestPoolOutput.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Output/test TestPoolOutput.sh"/>
<use name="FWCore/Utilities"/>
<bin file="TestPoolOutput.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Output/test TestPoolOutput.sh"/>
<use name="FWCore/Utilities"/>
</bin>

</environment>
8 changes: 4 additions & 4 deletions IOPool/Provenance/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<use name="DataFormats/Provenance"/>
<use name="FWCore/ParameterSet"/>
<use name="rootcore"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/ParameterSet"/>
<use name="rootcore"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
20 changes: 11 additions & 9 deletions IOPool/SecondaryInput/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<environment>
<bin file="TestSecondaryInput.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/SecondaryInput/test TestSecondaryInput.sh"/>
<use name="FWCore/Utilities"/>
<bin file="TestSecondaryInput.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/SecondaryInput/test TestSecondaryInput.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<library file="SecondaryProducer.cc" name="SecondaryProducer">
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/Sources"/>
<use name="FWCore/Utilities"/>

<library file="SecondaryProducer.cc" name="SecondaryProducer">
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/Sources"/>
<use name="FWCore/Utilities"/>
</library>

</environment>
36 changes: 18 additions & 18 deletions IOPool/Streamer/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="DataFormats/Streamer"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Sources"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Reflection"/>
<use name="FWCore/Version"/>
<use name="Utilities/StorageFactory"/>
<use name="rootcore"/>
<use name="zlib"/>
<use name="xz"/>
<use name="zstd"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="DataFormats/Streamer"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Sources"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Reflection"/>
<use name="FWCore/Version"/>
<use name="Utilities/StorageFactory"/>
<use name="rootcore"/>
<use name="zlib"/>
<use name="xz"/>
<use name="zstd"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
14 changes: 8 additions & 6 deletions IOPool/Streamer/bin/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<environment>
<bin file="DiagStreamerFile.cpp">
<use name="FWCore/Utilities"/>
<use name="IOPool/Streamer"/>
<bin file="DiagStreamerFile.cpp">
<use name="FWCore/Utilities"/>
<use name="IOPool/Streamer"/>
</bin>
<bin file="CalcAdler32.cpp">
<use name="FWCore/Utilities"/>
<use name="boost"/>

<bin file="CalcAdler32.cpp">
<use name="FWCore/Utilities"/>
<use name="boost"/>
</bin>

</environment>
10 changes: 5 additions & 5 deletions IOPool/Streamer/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<use name="FWCore/Framework"/>
<use name="FWCore/ServiceRegistry"/>
<use name="IOPool/Streamer"/>
<library file="*.cc" name="IOPoolStreamerPlugins">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ServiceRegistry"/>
<use name="IOPool/Streamer"/>
<library file="*.cc" name="IOPoolStreamerPlugins">
<flags EDM_PLUGIN="1"/>
</library>
63 changes: 36 additions & 27 deletions IOPool/Streamer/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,38 +1,47 @@
<environment>
<use name="FWCore/Framework"/>
<bin file="EventMessageTest.cpp">
<use name="IOPool/Streamer"/>
<use name="FWCore/Framework"/>
<bin file="EventMessageTest.cpp">
<use name="IOPool/Streamer"/>
</bin>
<bin file="ReadStreamerFile.cpp">
<use name="IOPool/Streamer"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Services"/>
<use name="FWCore/ParameterSetReader"/>
<flags TEST_RUNNER_ARGS="all"/>
<flags PRE_TEST="WriteStreamerFile"/>

<bin file="ReadStreamerFile.cpp">
<use name="IOPool/Streamer"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Services"/>
<use name="FWCore/ParameterSetReader"/>
<flags TEST_RUNNER_ARGS="all"/>
<flags PRE_TEST="WriteStreamerFile"/>
</bin>
<bin file="WriteStreamerFile.cpp">
<use name="IOPool/Streamer"/>

<bin file="WriteStreamerFile.cpp">
<use name="IOPool/Streamer"/>
</bin>
<bin file="RunThis_t.cpp" name="NewStreamerUNCOMPRESSED">
<flags TEST_RUNNER_ARGS="/bin/bash IOPool/Streamer/test RunUNCOMPRESSED.sh"/>

<bin file="RunThis_t.cpp" name="NewStreamerUNCOMPRESSED">
<flags TEST_RUNNER_ARGS="/bin/bash IOPool/Streamer/test RunUNCOMPRESSED.sh"/>
</bin>
<bin file="RunThis_t.cpp" name="NewStreamerZLIB">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunZLIB.sh"/>

<bin file="RunThis_t.cpp" name="NewStreamerZLIB">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunZLIB.sh"/>
</bin>
<bin file="RunThis_t.cpp" name="NewStreamerLZMA">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunLZMA.sh"/>

<bin file="RunThis_t.cpp" name="NewStreamerLZMA">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunLZMA.sh"/>
</bin>
<bin file="RunThis_t.cpp" name="NewStreamerZSTD">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunZSTD.sh"/>

<bin file="RunThis_t.cpp" name="NewStreamerZSTD">
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunZSTD.sh"/>
</bin>
<library file="StreamThingProducer.cc" name="StreamThingProducer">
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/TestObjects"/>

<library file="StreamThingProducer.cc" name="StreamThingProducer">
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/TestObjects"/>
</library>
<library file="StreamThingAnalyzer.cc" name="StreamThingAnalyzer">
<flags EDM_PLUGIN="1"/>

<library file="StreamThingAnalyzer.cc" name="StreamThingAnalyzer">
<flags EDM_PLUGIN="1"/>
</library>

</environment>
14 changes: 7 additions & 7 deletions IOPool/TFileAdaptor/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<use name="Utilities/StorageFactory"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Catalog"/>
<use name="rootcore"/>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Catalog"/>
<use name="rootcore"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
Loading

0 comments on commit b90bbec

Please sign in to comment.