Skip to content
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

Clean up BuildFiles under Utilities/ #29736

Merged
merged 1 commit into from
May 6, 2020
Merged

Clean up BuildFiles under Utilities/ #29736

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 Utilities/BinningTools/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<export>
<lib name="1"/>
<lib name="1"/>
</export>
14 changes: 7 additions & 7 deletions Utilities/DCacheAdaptor/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<export>
<lib name="1"/>
<flags CPPDEFINES="_FILE_OFFSET_BITS=32"/>
<lib name="1"/>
<flags CPPDEFINES="_FILE_OFFSET_BITS=32"/>
</export>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="dcap"/>
<flags CPPDEFINES="_FILE_OFFSET_BITS=32"/>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="dcap"/>
<flags CPPDEFINES="_FILE_OFFSET_BITS=32"/>
10 changes: 5 additions & 5 deletions Utilities/DCacheAdaptor/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<library file="DCacheStorageMaker.cc" name="UtilitiesDCacheAdaptorPlugin">
<use name="Utilities/StorageFactory"/>
<use name="Utilities/DCacheAdaptor"/>
<flags EDM_PLUGIN="1"/>
<flags cppflags="-D_FILE_OFFSET_BITS=32"/>
<library file="DCacheStorageMaker.cc" name="UtilitiesDCacheAdaptorPlugin">
<use name="Utilities/StorageFactory"/>
<use name="Utilities/DCacheAdaptor"/>
<flags EDM_PLUGIN="1"/>
<flags cppflags="-D_FILE_OFFSET_BITS=32"/>
</library>
10 changes: 5 additions & 5 deletions Utilities/DavixAdaptor/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<export>
<lib name="1"/>
<lib name="1"/>
</export>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="davix"/>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="davix"/>
8 changes: 4 additions & 4 deletions Utilities/DavixAdaptor/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<library file="DavixStorageMaker.cc" name="UtilitiesDavixAdaptorPlugin">
<use name="Utilities/StorageFactory"/>
<use name="Utilities/DavixAdaptor"/>
<flags EDM_PLUGIN="1"/>
<library file="DavixStorageMaker.cc" name="UtilitiesDavixAdaptorPlugin">
<use name="Utilities/StorageFactory"/>
<use name="Utilities/DavixAdaptor"/>
<flags EDM_PLUGIN="1"/>
</library>
28 changes: 18 additions & 10 deletions Utilities/DavixAdaptor/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
<use name="Utilities/StorageFactory"/>
<bin file="davixcheck.cpp" name="test_DavixCheck_http">
<use name="Utilities/StorageFactory"/>
<bin file="davixcheck.cpp" name="test_DavixCheck_http">
</bin>
<bin file="davixread.cpp" name="test_DavixRead_http">

<bin file="davixread.cpp" name="test_DavixRead_http">
</bin>
<bin file="davixreadv.cpp" name="test_DavixReadV_http">

<bin file="davixreadv.cpp" name="test_DavixReadV_http">
</bin>
<bin file="davixreadwrongurl.cpp" name="test_DavixReadWrongUrl_http">

<bin file="davixreadwrongurl.cpp" name="test_DavixReadWrongUrl_http">
</bin>
<bin file="davixreadfilenotfound.cpp" name="test_DavixReadFileNotFound_http">

<bin file="davixreadfilenotfound.cpp" name="test_DavixReadFileNotFound_http">
</bin>
<bin file="http.cpp" name="test_StorageFactory_Http">

<bin file="http.cpp" name="test_StorageFactory_Http">
</bin>
<bin file="http2.cpp" name="test_StorageFactory_Http2">

<bin file="http2.cpp" name="test_StorageFactory_Http2">
</bin>
<bin file="http3.cpp" name="test_StorageFactory_Http3">

<bin file="http3.cpp" name="test_StorageFactory_Http3">
<flags NO_TESTRUN="1"/>
</bin>
<bin file="http4.cpp" name="test_StorageFactory_Http4">

<bin file="http4.cpp" name="test_StorageFactory_Http4">
</bin>
3 changes: 1 addition & 2 deletions Utilities/General/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<export>
<lib name="1"/>
<lib name="1"/>
</export>

6 changes: 3 additions & 3 deletions Utilities/General/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</bin>

<iftool name="cuda-gcc-support">
<test name="CudaGCCSupport" command="echo Supported GCC version"/>
<else/>
<test name="CudaGCCSupport" command="echo ERROR: Unsupported GCC version; exit 1"/>
<test name="CudaGCCSupport" command="echo Supported GCC version"/>
<else/>
<test name="CudaGCCSupport" command="echo ERROR: Unsupported GCC version; exit 1"/>
</iftool>
18 changes: 9 additions & 9 deletions Utilities/LStoreAdaptor/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<export>
<lib name="1"/>
<flags CPPDEFINES="_FILE_OFFSET_BITS=64"/>
<lib name="1"/>
<flags CPPDEFINES="_FILE_OFFSET_BITS=64"/>
</export>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="boost"/>
<use name="boost_filesystem"/>
<use name="boost_regex"/>
<flags CPPDEFINES="_FILE_OFFSET_BITS=64"/>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="boost"/>
<use name="boost_filesystem"/>
<use name="boost_regex"/>
<flags CPPDEFINES="_FILE_OFFSET_BITS=64"/>
8 changes: 4 additions & 4 deletions Utilities/LStoreAdaptor/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<library file="LStoreStorageMaker.cc" name="UtilitiesLStoreAdaptorPlugin">
<use name="Utilities/StorageFactory"/>
<use name="Utilities/LStoreAdaptor"/>
<flags EDM_PLUGIN="1"/>
<library file="LStoreStorageMaker.cc" name="UtilitiesLStoreAdaptorPlugin">
<use name="Utilities/StorageFactory"/>
<use name="Utilities/LStoreAdaptor"/>
<flags EDM_PLUGIN="1"/>
</library>
14 changes: 7 additions & 7 deletions Utilities/PPS/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<use name="hector"/>
<use name="hepmc"/>
<use name="clhep"/>
<use name="root"/>
<use name="boost"/>
<use name="boost_program_options"/>
<use name="hector"/>
<use name="hepmc"/>
<use name="clhep"/>
<use name="root"/>
<use name="boost"/>
<use name="boost_program_options"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
2 changes: 0 additions & 2 deletions Utilities/StaticAnalyzers/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@
<architecture name="osx">
<flags LDFLAGs="-flat_namespace"/>
</architecture>


18 changes: 9 additions & 9 deletions Utilities/StorageFactory/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<use name="FWCore/PluginManager"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ServiceRegistry"/>
<use name="boost"/>
<use name="openssl"/>
<use name="tbb"/>
<flags cppflags="-D_FILE_OFFSET_BITS=64"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ServiceRegistry"/>
<use name="boost"/>
<use name="openssl"/>
<use name="tbb"/>
<flags cppflags="-D_FILE_OFFSET_BITS=64"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
4 changes: 2 additions & 2 deletions Utilities/StorageFactory/bin/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<use name="Utilities/StorageFactory"/>
<bin file="anycp.cpp" name="cms_anycp">
<use name="Utilities/StorageFactory"/>
<bin file="anycp.cpp" name="cms_anycp">
</bin>
8 changes: 4 additions & 4 deletions Utilities/StorageFactory/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<library file="GsiFTPStorageMaker.cc HttpStorageMaker.cc LocalStorageMaker.cc StormStorageMaker.cc StormLCGStorageMaker.cc StatisticsSenderServiceMaker.cc" name="UtilitiesStorageFactoryPlugins">
<use name="Utilities/StorageFactory"/>
<flags EDM_PLUGIN="1"/>
<flags cppflags="-D_FILE_OFFSET_BITS=64"/>
<library file="GsiFTPStorageMaker.cc HttpStorageMaker.cc LocalStorageMaker.cc StormStorageMaker.cc StormLCGStorageMaker.cc StatisticsSenderServiceMaker.cc" name="UtilitiesStorageFactoryPlugins">
<use name="Utilities/StorageFactory"/>
<flags EDM_PLUGIN="1"/>
<flags cppflags="-D_FILE_OFFSET_BITS=64"/>
</library>
53 changes: 33 additions & 20 deletions Utilities/StorageFactory/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,52 @@
<use name="Utilities/StorageFactory"/>
<use name="FWCore/ParameterSet"/>
<bin file="t0Repack.cpp" name="test_StorageFactory_t0Repack">
<use name="Utilities/StorageFactory"/>
<use name="FWCore/ParameterSet"/>
<bin file="t0Repack.cpp" name="test_StorageFactory_t0Repack">
<flags NO_TESTRUN="1"/>
</bin>
<bin file="randomread.cpp" name="test_StorageFactory_randomread">

<bin file="randomread.cpp" name="test_StorageFactory_randomread">
<flags NO_TESTRUN="1"/>
</bin>
<bin file="any.cpp" name="test_StorageFactory_Any">

<bin file="any.cpp" name="test_StorageFactory_Any">
<flags NO_TESTRUN="1"/>
</bin>
<bin file="local.cpp" name="test_StorageFactory_Local">

<bin file="local.cpp" name="test_StorageFactory_Local">
</bin>
<bin file="local2.cpp" name="test_StorageFactory_Local2">

<bin file="local2.cpp" name="test_StorageFactory_Local2">
</bin>
<bin file="local3.cpp" name="test_StorageFactory_Local3">

<bin file="local3.cpp" name="test_StorageFactory_Local3">
</bin>
<bin file="ftp.cpp" name="test_StorageFactory_Ftp">

<bin file="ftp.cpp" name="test_StorageFactory_Ftp">
<flags NO_TESTRUN="1"/>
</bin>
<bin file="ftp2.cpp" name="test_StorageFactory_Ftp2">

<bin file="ftp2.cpp" name="test_StorageFactory_Ftp2">
<flags NO_TESTRUN="1"/>
</bin>
<bin file="rfio2.cpp" name="test_StorageFactory_Rfio2">

<bin file="rfio2.cpp" name="test_StorageFactory_Rfio2">
</bin>
<bin file="rfio3.cpp" name="test_StorageFactory_Rfio3">

<bin file="rfio3.cpp" name="test_StorageFactory_Rfio3">
</bin>
<bin file="write.cpp" name="test_StorageFactory_Write">

<bin file="write.cpp" name="test_StorageFactory_Write">
<flags NO_TESTRUN="1"/>
</bin>
<bin file="mkstemp.cpp" name="test_StorageFactory_Mkstemp">

<bin file="mkstemp.cpp" name="test_StorageFactory_Mkstemp">
</bin>
# We do not currently run the threadsafe test, as the StorageFactoryMaker is not thread-safe
# (the underlying PluginManager can be called from multiple threads, but itself is not
# thread safe.)
# It's not that hard guard accesses to the PluginManager, but per Chris Jones, we want
# to wait until the framework decides on a threading model to implement a fix.
# file="threadsafe.cpp" name="test_StorageFactory_threadsafe"

<!--
We do not currently run the threadsafe test, as the StorageFactoryMaker is not thread-safe
(the underlying PluginManager can be called from multiple threads, but itself is not
thread safe.)
It's not that hard guard accesses to the PluginManager, but per Chris Jones, we want
to wait until the framework decides on a threading model to implement a fix.
file="threadsafe.cpp" name="test_StorageFactory_threadsafe"
-->
4 changes: 2 additions & 2 deletions Utilities/Xerces/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<use name="xerces-c"/>
<use name="xerces-c"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
2 changes: 1 addition & 1 deletion Utilities/Xerces/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<bin file="test_xercesInitialize.cpp">
<use name="Utilities/Xerces"/>
<use name="Utilities/Xerces"/>
</bin>
16 changes: 8 additions & 8 deletions Utilities/XrdAdaptor/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<export>
<lib name="1"/>
<lib name="1"/>
</export>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="xrootd"/>
<lib name="XrdCl"/>
<lib name="XrdUtils"/>
<flags CPPDEFINES="_FILE_OFFSET_BITS=64"/>
<use name="Utilities/StorageFactory"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="xrootd"/>
<lib name="XrdCl"/>
<lib name="XrdUtils"/>
<flags CPPDEFINES="_FILE_OFFSET_BITS=64"/>
12 changes: 6 additions & 6 deletions Utilities/XrdAdaptor/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<library file="XrdStorageMaker.cc" name="UtilitiesXrdAdaptorPlugin">
<use name="Utilities/StorageFactory"/>
<use name="Utilities/XrdAdaptor"/>
<lib name="XrdCl"/>
<flags EDM_PLUGIN="1"/>
<flags CXXFLAGS="-D_FILE_OFFSET_BITS=64"/>
<library file="XrdStorageMaker.cc" name="UtilitiesXrdAdaptorPlugin">
<use name="Utilities/StorageFactory"/>
<use name="Utilities/XrdAdaptor"/>
<lib name="XrdCl"/>
<flags EDM_PLUGIN="1"/>
<flags CXXFLAGS="-D_FILE_OFFSET_BITS=64"/>
</library>