Skip to content

Commit b90bbec

Browse files
fwyzardfwyzard
committed
Clean up BuildFiles under IOPool/
Clean up BuildFile.xml filea with `xmllint --format`.
1 parent b5b4bf2 commit b90bbec

File tree

16 files changed

+178
-158
lines changed

16 files changed

+178
-158
lines changed

‎IOPool/Common/BuildFile.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<use name="FWCore/ServiceRegistry"/>
2-
<use name="FWCore/Utilities"/>
1+
<use name="FWCore/ServiceRegistry"/>
2+
<use name="FWCore/Utilities"/>
33
<export>
4-
<lib name="1"/>
4+
<lib name="1"/>
55
</export>

‎IOPool/Common/bin/BuildFile.xml‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
1-
<bin name="edmProvDump" file="EdmProvDump.cc,">
2-
<use name="boost_program_options"/>
3-
<use name="rootcore"/>
4-
<use name="DataFormats/Common"/>
5-
<use name="DataFormats/Provenance"/>
6-
<use name="FWCore/Catalog"/>
7-
<use name="FWCore/ParameterSet"/>
8-
<use name="FWCore/ServiceRegistry"/>
9-
<use name="FWCore/Services"/>
10-
<use name="FWCore/Utilities"/>
11-
<use name="DataFormats/StdDictionaries"/>
12-
<use name="DataFormats/WrappedStdDictionaries"/>
1+
<bin name="edmProvDump" file="EdmProvDump.cc,">
2+
<use name="boost_program_options"/>
3+
<use name="rootcore"/>
4+
<use name="DataFormats/Common"/>
5+
<use name="DataFormats/Provenance"/>
6+
<use name="FWCore/Catalog"/>
7+
<use name="FWCore/ParameterSet"/>
8+
<use name="FWCore/ServiceRegistry"/>
9+
<use name="FWCore/Services"/>
10+
<use name="FWCore/Utilities"/>
11+
<use name="DataFormats/StdDictionaries"/>
12+
<use name="DataFormats/WrappedStdDictionaries"/>
1313
</bin>
14-
<bin name="edmFileUtil" file="EdmFileUtil.cpp,CollUtil.cc">
15-
<use name="boost"/>
16-
<use name="boost_program_options"/>
17-
<use name="rootcore"/>
18-
<use name="roothistmatrix"/>
19-
<use name="DataFormats/Provenance"/>
20-
<use name="FWCore/Catalog"/>
21-
<use name="FWCore/ParameterSet"/>
22-
<use name="FWCore/PluginManager"/>
23-
<use name="FWCore/ServiceRegistry"/>
24-
<use name="FWCore/Services"/>
14+
15+
<bin name="edmFileUtil" file="EdmFileUtil.cpp,CollUtil.cc">
16+
<use name="boost"/>
17+
<use name="boost_program_options"/>
18+
<use name="rootcore"/>
19+
<use name="roothistmatrix"/>
20+
<use name="DataFormats/Provenance"/>
21+
<use name="FWCore/Catalog"/>
22+
<use name="FWCore/ParameterSet"/>
23+
<use name="FWCore/PluginManager"/>
24+
<use name="FWCore/ServiceRegistry"/>
25+
<use name="FWCore/Services"/>
2526
</bin>
26-
<bin name="edmCopyUtil" file="EdmCopyUtil.cpp">
27-
<use name="boost"/>
28-
<use name="boost_program_options"/>
29-
<use name="Utilities/StorageFactory"/>
30-
<use name="FWCore/ServiceRegistry"/>
31-
<use name="FWCore/Services"/>
32-
<use name="FWCore/Catalog"/>
33-
<use name="FWCore/ParameterSet"/>
27+
28+
<bin name="edmCopyUtil" file="EdmCopyUtil.cpp">
29+
<use name="boost"/>
30+
<use name="boost_program_options"/>
31+
<use name="Utilities/StorageFactory"/>
32+
<use name="FWCore/ServiceRegistry"/>
33+
<use name="FWCore/Services"/>
34+
<use name="FWCore/Catalog"/>
35+
<use name="FWCore/ParameterSet"/>
3436
</bin>

‎IOPool/Common/test/BuildFile.xml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<environment>
2-
<bin file="TestIOPoolCommon.cpp" name="TestEdmFastMerge">
3-
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test TestEdmFastMerge.sh"/>
4-
<use name="FWCore/Utilities"/>
2+
<bin file="TestIOPoolCommon.cpp" name="TestEdmFastMerge">
3+
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test TestEdmFastMerge.sh"/>
4+
<use name="FWCore/Utilities"/>
55
</bin>
6-
<bin file="TestIOPoolCommon.cpp" name="TestEdmConfigDump">
7-
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test run_TestEdmConfigDump.sh"/>
8-
<use name="FWCore/Utilities"/>
6+
7+
<bin file="TestIOPoolCommon.cpp" name="TestEdmConfigDump">
8+
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test run_TestEdmConfigDump.sh"/>
9+
<use name="FWCore/Utilities"/>
910
</bin>
11+
1012
</environment>

‎IOPool/Input/BuildFile.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<use name="DataFormats/Common"/>
2-
<use name="DataFormats/Provenance"/>
3-
<use name="FWCore/Catalog"/>
4-
<use name="FWCore/Framework"/>
5-
<use name="FWCore/MessageLogger"/>
6-
<use name="FWCore/ParameterSet"/>
7-
<use name="FWCore/ServiceRegistry"/>
8-
<use name="FWCore/Sources"/>
9-
<use name="FWCore/Utilities"/>
10-
<use name="IOPool/Common"/>
11-
<use name="Utilities/StorageFactory"/>
12-
<use name="clhep"/>
13-
<use name="rootcore"/>
14-
<flags EDM_PLUGIN="1"/>
1+
<use name="DataFormats/Common"/>
2+
<use name="DataFormats/Provenance"/>
3+
<use name="FWCore/Catalog"/>
4+
<use name="FWCore/Framework"/>
5+
<use name="FWCore/MessageLogger"/>
6+
<use name="FWCore/ParameterSet"/>
7+
<use name="FWCore/ServiceRegistry"/>
8+
<use name="FWCore/Sources"/>
9+
<use name="FWCore/Utilities"/>
10+
<use name="IOPool/Common"/>
11+
<use name="Utilities/StorageFactory"/>
12+
<use name="clhep"/>
13+
<use name="rootcore"/>
14+
<flags EDM_PLUGIN="1"/>

‎IOPool/Input/test/BuildFile.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<environment>
2-
<bin file="TestPoolInput.cpp">
3-
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Input/test TestPoolInput.sh"/>
4-
<use name="FWCore/Utilities"/>
2+
<bin file="TestPoolInput.cpp">
3+
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Input/test TestPoolInput.sh"/>
4+
<use name="FWCore/Utilities"/>
55
</bin>
6-
<library file="IOExerciser.cc" name="IOExerciser">
7-
<flags EDM_PLUGIN="1"/>
6+
7+
<library file="IOExerciser.cc" name="IOExerciser">
8+
<flags EDM_PLUGIN="1"/>
89
<use name="FWCore/Framework"/>
910
<use name="FWCore/PluginManager"/>
1011
<use name="FWCore/ParameterSet"/>
1112
</library>
13+
1214
</environment>

‎IOPool/Output/BuildFile.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<use name="DataFormats/Common"/>
2-
<use name="DataFormats/Provenance"/>
3-
<use name="FWCore/Framework"/>
4-
<use name="FWCore/MessageLogger"/>
5-
<use name="FWCore/ParameterSet"/>
6-
<use name="FWCore/ServiceRegistry"/>
7-
<use name="FWCore/Utilities"/>
8-
<use name="FWCore/Version"/>
9-
<use name="IOPool/Common"/>
10-
<use name="IOPool/Provenance"/>
11-
<use name="rootcore"/>
1+
<use name="DataFormats/Common"/>
2+
<use name="DataFormats/Provenance"/>
3+
<use name="FWCore/Framework"/>
4+
<use name="FWCore/MessageLogger"/>
5+
<use name="FWCore/ParameterSet"/>
6+
<use name="FWCore/ServiceRegistry"/>
7+
<use name="FWCore/Utilities"/>
8+
<use name="FWCore/Version"/>
9+
<use name="IOPool/Common"/>
10+
<use name="IOPool/Provenance"/>
11+
<use name="rootcore"/>
1212
<export>
13-
<lib name="1"/>
13+
<lib name="1"/>
1414
</export>

‎IOPool/Output/plugins/BuildFile.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<use name="IOPool/Output"/>
2-
<library file="Module.cc" name="IOPoolOutputPlugins">
3-
<flags EDM_PLUGIN="1"/>
1+
<use name="IOPool/Output"/>
2+
<library file="Module.cc" name="IOPoolOutputPlugins">
3+
<flags EDM_PLUGIN="1"/>
44
</library>

‎IOPool/Output/test/BuildFile.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<environment>
2-
<bin file="TestPoolOutput.cpp">
3-
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Output/test TestPoolOutput.sh"/>
4-
<use name="FWCore/Utilities"/>
2+
<bin file="TestPoolOutput.cpp">
3+
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Output/test TestPoolOutput.sh"/>
4+
<use name="FWCore/Utilities"/>
55
</bin>
6+
67
</environment>

‎IOPool/Provenance/BuildFile.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<use name="DataFormats/Provenance"/>
2-
<use name="FWCore/ParameterSet"/>
3-
<use name="rootcore"/>
1+
<use name="DataFormats/Provenance"/>
2+
<use name="FWCore/ParameterSet"/>
3+
<use name="rootcore"/>
44
<export>
5-
<lib name="1"/>
5+
<lib name="1"/>
66
</export>

‎IOPool/SecondaryInput/test/BuildFile.xml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<environment>
2-
<bin file="TestSecondaryInput.cpp">
3-
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/SecondaryInput/test TestSecondaryInput.sh"/>
4-
<use name="FWCore/Utilities"/>
2+
<bin file="TestSecondaryInput.cpp">
3+
<flags TEST_RUNNER_ARGS=" /bin/bash IOPool/SecondaryInput/test TestSecondaryInput.sh"/>
4+
<use name="FWCore/Utilities"/>
55
</bin>
6-
<library file="SecondaryProducer.cc" name="SecondaryProducer">
7-
<flags EDM_PLUGIN="1"/>
8-
<use name="DataFormats/Provenance"/>
9-
<use name="FWCore/Framework"/>
10-
<use name="FWCore/Sources"/>
11-
<use name="FWCore/Utilities"/>
6+
7+
<library file="SecondaryProducer.cc" name="SecondaryProducer">
8+
<flags EDM_PLUGIN="1"/>
9+
<use name="DataFormats/Provenance"/>
10+
<use name="FWCore/Framework"/>
11+
<use name="FWCore/Sources"/>
12+
<use name="FWCore/Utilities"/>
1213
</library>
14+
1315
</environment>

0 commit comments

Comments
 (0)