Skip to content

Commit

Permalink
Clean up BuildFiles under FWCore/
Browse files Browse the repository at this point in the history 
Clean up BuildFile.xml filea with `xmllint --format`.
  • Loading branch information
@fwyzard
fwyzard committed May 5, 2020
1 parent b5b4bf2 commit 0988afe
Show file tree
Hide file tree
Showing 64 changed files with 1,543 additions and 1,324 deletions.
10 changes: 5 additions & 5 deletions FWCore/Catalog/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="tinyxml2"/>
<use name="boost"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="tinyxml2"/>
<use name="boost"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
8 changes: 4 additions & 4 deletions FWCore/Catalog/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<use name="FWCore/Catalog"/>
<use name="FWCore/ServiceRegistry"/>
<use name="catch2"/>
<bin name="edmCatalogFileLocator_t" file="FileLocator_t.cpp">
<use name="FWCore/Catalog"/>
<use name="FWCore/ServiceRegistry"/>
<use name="catch2"/>
<bin name="edmCatalogFileLocator_t" file="FileLocator_t.cpp">
</bin>
10 changes: 5 additions & 5 deletions FWCore/Common/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<use name="DataFormats/Provenance"/>
<use name="DataFormats/Common"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="DataFormats/Provenance"/>
<use name="DataFormats/Common"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
4 changes: 2 additions & 2 deletions FWCore/Concurrency/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<use name="tbb"/>
<use name="tbb"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
19 changes: 11 additions & 8 deletions FWCore/Concurrency/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
<bin name="testFWCoreConcurrency" file="*.cppunit.cpp">
<use name="cppunit"/>
<use name="FWCore/Concurrency"/>
<bin name="testFWCoreConcurrency" file="*.cppunit.cpp">
<use name="cppunit"/>
<use name="FWCore/Concurrency"/>
</bin>

<bin file="test_threadSafeOutputFileStream.cpp">
<use name="FWCore/Concurrency"/>
<use name="FWCore/Concurrency"/>
<flags NO_TESTRUN="1"/>
</bin>

<bin file="ThreadSafeAddOnlyContainer_t.cpp">
<use name="FWCore/Concurrency"/>
<use name="FWCore/Concurrency"/>
</bin>
<bin file="TestFWCoreConcurrencyDriver.cpp">
<use name="FWCore/Utilities"/>
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Concurrency/test run_streamGrapher_test.sh run_threadSafeOutputFileStream_test.sh"/>

<bin file="TestFWCoreConcurrencyDriver.cpp">
<use name="FWCore/Utilities"/>
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/Concurrency/test run_streamGrapher_test.sh run_threadSafeOutputFileStream_test.sh"/>
</bin>

<bin name="testFWCoreConcurrencyTBB.cc" file="TestTBB.cc">
Expand Down
12 changes: 6 additions & 6 deletions FWCore/FWLite/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Utilities"/>
<use name="rootcore"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Utilities"/>
<use name="rootcore"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
20 changes: 10 additions & 10 deletions FWCore/FWLite/bin/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<bin name="edmClassStorageSize" file="storageSize.cc">
<use name="rootcore"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="FWCore/FWLite"/>
<bin name="edmClassStorageSize" file="storageSize.cc">
<use name="rootcore"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="FWCore/FWLite"/>
</bin>

<bin name="edmBranchStorageSize" file="storageSizeForBranch.cc">
<use name="rootcore"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="FWCore/FWLite"/>
<bin name="edmBranchStorageSize" file="storageSizeForBranch.cc">
<use name="rootcore"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="FWCore/FWLite"/>
</bin>
15 changes: 8 additions & 7 deletions FWCore/FWLite/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<environment>
<use name="cppunit"/>
<use name="cppunit"/>
</environment>
<bin name="testFWCoreFWLite" file="ref_t.cppunit.cpp">
<use name="FWCore/FWLite"/>
<use name="DataFormats/TestObjects"/>
<bin name="testFWCoreFWLite" file="ref_t.cppunit.cpp">
<use name="FWCore/FWLite"/>
<use name="DataFormats/TestObjects"/>
</bin>
<bin file="TestRunnerFWCoreFWLite.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/FWLite/test run_all_t.sh"/>
<use name="FWCore/Utilities"/>

<bin file="TestRunnerFWCoreFWLite.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash FWCore/FWLite/test run_all_t.sh"/>
<use name="FWCore/Utilities"/>
</bin>
28 changes: 14 additions & 14 deletions FWCore/Framework/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Common"/>
<use name="FWCore/Concurrency"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Reflection"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Version"/>
<use name="boost"/>
<use name="rootcore"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Common"/>
<use name="FWCore/Concurrency"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Reflection"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Version"/>
<use name="boost"/>
<use name="rootcore"/>
<flags ADD_SUBDIR="1"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
151 changes: 78 additions & 73 deletions FWCore/Framework/bin/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,88 +1,93 @@
<architecture name="slc6_amd64">
<flags LDFLAGS="-Wl,-dynamic-linker,$(GLIBC_BASE)/lib64/ld.so"/>
</architecture>
<bin name="cmsRunGlibC" file="cmsRun.cpp">
<use name="roothistmatrix"/>
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>
<bin name="cmsRunGlibC" file="cmsRun.cpp">
<use name="roothistmatrix"/>
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>
</bin>
<bin name="cmsRunTC" file="cmsRun.cpp">
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="tcmalloc_minimal"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>

<bin name="cmsRunTC" file="cmsRun.cpp">
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="tcmalloc_minimal"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>
</bin>
<bin name="cmsRun" file="cmsRun.cpp">
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>

<bin name="cmsRun" file="cmsRun.cpp">
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>
<!-- jemalloc is mostly tested on x86_64 in upstream -->
<architecture name=".*_amd64_.*">
<use name="jemalloc"/>
<use name="jemalloc"/>
</architecture>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>
</bin>
<bin name="cmsRunVDT" file="cmsRun.cpp">
<use name="vdt"/>
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="jemalloc"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>

<bin name="cmsRunVDT" file="cmsRun.cpp">
<use name="vdt"/>
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="jemalloc"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>
</bin>
<bin name="cmsRunJE" file="cmsRun.cpp">
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="jemalloc"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>

<bin name="cmsRunJE" file="cmsRun.cpp">
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="jemalloc"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>
</bin>
<bin name="cmsRunPython3" file="cmsRunPython3.cpp">
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>

<bin name="cmsRunPython3" file="cmsRunPython3.cpp">
<use name="tbb"/>
<use name="boost"/>
<use name="boost_program_options"/>
<!-- jemalloc is mostly tested on x86_64 in upstream -->
<architecture name=".*_amd64_.*">
<use name="jemalloc"/>
<use name="jemalloc"/>
</architecture>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PyDevParameterSet"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PyDevParameterSet"/>
</bin>
Loading

0 comments on commit 0988afe

Please sign in to comment.