Skip to content

Commit 0988afe

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

File tree

64 files changed

+1543
-1324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1543
-1324
lines changed

‎FWCore/Catalog/BuildFile.xml‎

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

‎FWCore/Catalog/test/BuildFile.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<use name="FWCore/Catalog"/>
2-
<use name="FWCore/ServiceRegistry"/>
3-
<use name="catch2"/>
4-
<bin name="edmCatalogFileLocator_t" file="FileLocator_t.cpp">
1+
<use name="FWCore/Catalog"/>
2+
<use name="FWCore/ServiceRegistry"/>
3+
<use name="catch2"/>
4+
<bin name="edmCatalogFileLocator_t" file="FileLocator_t.cpp">
55
</bin>

‎FWCore/Common/BuildFile.xml‎

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

‎FWCore/Concurrency/BuildFile.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<use name="tbb"/>
1+
<use name="tbb"/>
22
<export>
3-
<lib name="1"/>
3+
<lib name="1"/>
44
</export>

‎FWCore/Concurrency/test/BuildFile.xml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
<bin name="testFWCoreConcurrency" file="*.cppunit.cpp">
2-
<use name="cppunit"/>
3-
<use name="FWCore/Concurrency"/>
1+
<bin name="testFWCoreConcurrency" file="*.cppunit.cpp">
2+
<use name="cppunit"/>
3+
<use name="FWCore/Concurrency"/>
44
</bin>
5+
56
<bin file="test_threadSafeOutputFileStream.cpp">
6-
<use name="FWCore/Concurrency"/>
7+
<use name="FWCore/Concurrency"/>
78
<flags NO_TESTRUN="1"/>
89
</bin>
10+
911
<bin file="ThreadSafeAddOnlyContainer_t.cpp">
10-
<use name="FWCore/Concurrency"/>
12+
<use name="FWCore/Concurrency"/>
1113
</bin>
12-
<bin file="TestFWCoreConcurrencyDriver.cpp">
13-
<use name="FWCore/Utilities"/>
14-
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Concurrency/test run_streamGrapher_test.sh run_threadSafeOutputFileStream_test.sh"/>
14+
15+
<bin file="TestFWCoreConcurrencyDriver.cpp">
16+
<use name="FWCore/Utilities"/>
17+
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Concurrency/test run_streamGrapher_test.sh run_threadSafeOutputFileStream_test.sh"/>
1518
</bin>
1619

1720
<bin name="testFWCoreConcurrencyTBB.cc" file="TestTBB.cc">

‎FWCore/FWLite/BuildFile.xml‎

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

‎FWCore/FWLite/bin/BuildFile.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<bin name="edmClassStorageSize" file="storageSize.cc">
2-
<use name="rootcore"/>
3-
<use name="boost"/>
4-
<use name="boost_program_options"/>
5-
<use name="FWCore/FWLite"/>
1+
<bin name="edmClassStorageSize" file="storageSize.cc">
2+
<use name="rootcore"/>
3+
<use name="boost"/>
4+
<use name="boost_program_options"/>
5+
<use name="FWCore/FWLite"/>
66
</bin>
77

8-
<bin name="edmBranchStorageSize" file="storageSizeForBranch.cc">
9-
<use name="rootcore"/>
10-
<use name="boost"/>
11-
<use name="boost_program_options"/>
12-
<use name="FWCore/FWLite"/>
8+
<bin name="edmBranchStorageSize" file="storageSizeForBranch.cc">
9+
<use name="rootcore"/>
10+
<use name="boost"/>
11+
<use name="boost_program_options"/>
12+
<use name="FWCore/FWLite"/>
1313
</bin>

‎FWCore/FWLite/test/BuildFile.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<environment>
2-
<use name="cppunit"/>
2+
<use name="cppunit"/>
33
</environment>
4-
<bin name="testFWCoreFWLite" file="ref_t.cppunit.cpp">
5-
<use name="FWCore/FWLite"/>
6-
<use name="DataFormats/TestObjects"/>
4+
<bin name="testFWCoreFWLite" file="ref_t.cppunit.cpp">
5+
<use name="FWCore/FWLite"/>
6+
<use name="DataFormats/TestObjects"/>
77
</bin>
8-
<bin file="TestRunnerFWCoreFWLite.cpp">
9-
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/FWLite/test run_all_t.sh"/>
10-
<use name="FWCore/Utilities"/>
8+
9+
<bin file="TestRunnerFWCoreFWLite.cpp">
10+
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/FWLite/test run_all_t.sh"/>
11+
<use name="FWCore/Utilities"/>
1112
</bin>

‎FWCore/Framework/BuildFile.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<use name="DataFormats/Common"/>
2-
<use name="DataFormats/Provenance"/>
3-
<use name="FWCore/Common"/>
4-
<use name="FWCore/Concurrency"/>
5-
<use name="FWCore/MessageLogger"/>
6-
<use name="FWCore/ParameterSet"/>
7-
<use name="FWCore/PluginManager"/>
8-
<use name="FWCore/ServiceRegistry"/>
9-
<use name="FWCore/Reflection"/>
10-
<use name="FWCore/Utilities"/>
11-
<use name="FWCore/Version"/>
12-
<use name="boost"/>
13-
<use name="rootcore"/>
1+
<use name="DataFormats/Common"/>
2+
<use name="DataFormats/Provenance"/>
3+
<use name="FWCore/Common"/>
4+
<use name="FWCore/Concurrency"/>
5+
<use name="FWCore/MessageLogger"/>
6+
<use name="FWCore/ParameterSet"/>
7+
<use name="FWCore/PluginManager"/>
8+
<use name="FWCore/ServiceRegistry"/>
9+
<use name="FWCore/Reflection"/>
10+
<use name="FWCore/Utilities"/>
11+
<use name="FWCore/Version"/>
12+
<use name="boost"/>
13+
<use name="rootcore"/>
1414
<flags ADD_SUBDIR="1"/>
1515
<export>
16-
<lib name="1"/>
16+
<lib name="1"/>
1717
</export>

‎FWCore/Framework/bin/BuildFile.xml‎

Lines changed: 78 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,93 @@
11
<architecture name="slc6_amd64">
22
<flags LDFLAGS="-Wl,-dynamic-linker,$(GLIBC_BASE)/lib64/ld.so"/>
33
</architecture>
4-
<bin name="cmsRunGlibC" file="cmsRun.cpp">
5-
<use name="roothistmatrix"/>
6-
<use name="tbb"/>
7-
<use name="boost"/>
8-
<use name="boost_program_options"/>
9-
<use name="FWCore/Framework"/>
10-
<use name="FWCore/MessageLogger"/>
11-
<use name="FWCore/PluginManager"/>
12-
<use name="FWCore/ServiceRegistry"/>
13-
<use name="FWCore/Utilities"/>
14-
<use name="FWCore/ParameterSet"/>
15-
<use name="FWCore/ParameterSetReader"/>
4+
<bin name="cmsRunGlibC" file="cmsRun.cpp">
5+
<use name="roothistmatrix"/>
6+
<use name="tbb"/>
7+
<use name="boost"/>
8+
<use name="boost_program_options"/>
9+
<use name="FWCore/Framework"/>
10+
<use name="FWCore/MessageLogger"/>
11+
<use name="FWCore/PluginManager"/>
12+
<use name="FWCore/ServiceRegistry"/>
13+
<use name="FWCore/Utilities"/>
14+
<use name="FWCore/ParameterSet"/>
15+
<use name="FWCore/ParameterSetReader"/>
1616
</bin>
17-
<bin name="cmsRunTC" file="cmsRun.cpp">
18-
<use name="tbb"/>
19-
<use name="boost"/>
20-
<use name="boost_program_options"/>
21-
<use name="tcmalloc_minimal"/>
22-
<use name="FWCore/Framework"/>
23-
<use name="FWCore/MessageLogger"/>
24-
<use name="FWCore/PluginManager"/>
25-
<use name="FWCore/ServiceRegistry"/>
26-
<use name="FWCore/Utilities"/>
27-
<use name="FWCore/ParameterSet"/>
28-
<use name="FWCore/ParameterSetReader"/>
17+
18+
<bin name="cmsRunTC" file="cmsRun.cpp">
19+
<use name="tbb"/>
20+
<use name="boost"/>
21+
<use name="boost_program_options"/>
22+
<use name="tcmalloc_minimal"/>
23+
<use name="FWCore/Framework"/>
24+
<use name="FWCore/MessageLogger"/>
25+
<use name="FWCore/PluginManager"/>
26+
<use name="FWCore/ServiceRegistry"/>
27+
<use name="FWCore/Utilities"/>
28+
<use name="FWCore/ParameterSet"/>
29+
<use name="FWCore/ParameterSetReader"/>
2930
</bin>
30-
<bin name="cmsRun" file="cmsRun.cpp">
31-
<use name="tbb"/>
32-
<use name="boost"/>
33-
<use name="boost_program_options"/>
31+
32+
<bin name="cmsRun" file="cmsRun.cpp">
33+
<use name="tbb"/>
34+
<use name="boost"/>
35+
<use name="boost_program_options"/>
3436
<!-- jemalloc is mostly tested on x86_64 in upstream -->
3537
<architecture name=".*_amd64_.*">
36-
<use name="jemalloc"/>
38+
<use name="jemalloc"/>
3739
</architecture>
38-
<use name="FWCore/Framework"/>
39-
<use name="FWCore/MessageLogger"/>
40-
<use name="FWCore/PluginManager"/>
41-
<use name="FWCore/ServiceRegistry"/>
42-
<use name="FWCore/Utilities"/>
43-
<use name="FWCore/ParameterSet"/>
44-
<use name="FWCore/ParameterSetReader"/>
40+
<use name="FWCore/Framework"/>
41+
<use name="FWCore/MessageLogger"/>
42+
<use name="FWCore/PluginManager"/>
43+
<use name="FWCore/ServiceRegistry"/>
44+
<use name="FWCore/Utilities"/>
45+
<use name="FWCore/ParameterSet"/>
46+
<use name="FWCore/ParameterSetReader"/>
4547
</bin>
46-
<bin name="cmsRunVDT" file="cmsRun.cpp">
47-
<use name="vdt"/>
48-
<use name="tbb"/>
49-
<use name="boost"/>
50-
<use name="boost_program_options"/>
51-
<use name="jemalloc"/>
52-
<use name="FWCore/Framework"/>
53-
<use name="FWCore/MessageLogger"/>
54-
<use name="FWCore/PluginManager"/>
55-
<use name="FWCore/ServiceRegistry"/>
56-
<use name="FWCore/Utilities"/>
57-
<use name="FWCore/ParameterSet"/>
58-
<use name="FWCore/ParameterSetReader"/>
48+
49+
<bin name="cmsRunVDT" file="cmsRun.cpp">
50+
<use name="vdt"/>
51+
<use name="tbb"/>
52+
<use name="boost"/>
53+
<use name="boost_program_options"/>
54+
<use name="jemalloc"/>
55+
<use name="FWCore/Framework"/>
56+
<use name="FWCore/MessageLogger"/>
57+
<use name="FWCore/PluginManager"/>
58+
<use name="FWCore/ServiceRegistry"/>
59+
<use name="FWCore/Utilities"/>
60+
<use name="FWCore/ParameterSet"/>
61+
<use name="FWCore/ParameterSetReader"/>
5962
</bin>
60-
<bin name="cmsRunJE" file="cmsRun.cpp">
61-
<use name="tbb"/>
62-
<use name="boost"/>
63-
<use name="boost_program_options"/>
64-
<use name="jemalloc"/>
65-
<use name="FWCore/Framework"/>
66-
<use name="FWCore/MessageLogger"/>
67-
<use name="FWCore/PluginManager"/>
68-
<use name="FWCore/ServiceRegistry"/>
69-
<use name="FWCore/Utilities"/>
70-
<use name="FWCore/ParameterSet"/>
71-
<use name="FWCore/ParameterSetReader"/>
63+
64+
<bin name="cmsRunJE" file="cmsRun.cpp">
65+
<use name="tbb"/>
66+
<use name="boost"/>
67+
<use name="boost_program_options"/>
68+
<use name="jemalloc"/>
69+
<use name="FWCore/Framework"/>
70+
<use name="FWCore/MessageLogger"/>
71+
<use name="FWCore/PluginManager"/>
72+
<use name="FWCore/ServiceRegistry"/>
73+
<use name="FWCore/Utilities"/>
74+
<use name="FWCore/ParameterSet"/>
75+
<use name="FWCore/ParameterSetReader"/>
7276
</bin>
73-
<bin name="cmsRunPython3" file="cmsRunPython3.cpp">
74-
<use name="tbb"/>
75-
<use name="boost"/>
76-
<use name="boost_program_options"/>
77+
78+
<bin name="cmsRunPython3" file="cmsRunPython3.cpp">
79+
<use name="tbb"/>
80+
<use name="boost"/>
81+
<use name="boost_program_options"/>
7782
<!-- jemalloc is mostly tested on x86_64 in upstream -->
7883
<architecture name=".*_amd64_.*">
79-
<use name="jemalloc"/>
84+
<use name="jemalloc"/>
8085
</architecture>
81-
<use name="FWCore/Framework"/>
82-
<use name="FWCore/MessageLogger"/>
83-
<use name="FWCore/PluginManager"/>
84-
<use name="FWCore/ServiceRegistry"/>
85-
<use name="FWCore/Utilities"/>
86-
<use name="FWCore/ParameterSet"/>
87-
<use name="FWCore/PyDevParameterSet"/>
86+
<use name="FWCore/Framework"/>
87+
<use name="FWCore/MessageLogger"/>
88+
<use name="FWCore/PluginManager"/>
89+
<use name="FWCore/ServiceRegistry"/>
90+
<use name="FWCore/Utilities"/>
91+
<use name="FWCore/ParameterSet"/>
92+
<use name="FWCore/PyDevParameterSet"/>
8893
</bin>

0 commit comments

Comments
 (0)