Skip to content

Commit 6fadb03

Browse files
eflumerfeflumerf
authored
Merge pull request #250 from art-daq/revert-249-revert-243-eflumerf/RemoveUPS
Revert "Revert "The last vestiges of the old UPS system have been swept away.""
2 parents d8b092e + 5b36b06 commit 6fadb03

File tree

23 files changed

+74
-791
lines changed

23 files changed

+74
-791
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ endif()
8989

9090
#cet_report_compiler_flags()
9191
find_package(TRACE 3.17.04 REQUIRED EXPORT)
92-
find_package(artdaq_core 3.08.04 REQUIRED EXPORT)
93-
find_package(artdaq_utilities 1.07.02 REQUIRED EXPORT)
92+
find_package(artdaq-core 3.08.04 REQUIRED EXPORT)
93+
find_package(artdaq-utilities 1.07.02 REQUIRED EXPORT)
9494

9595
find_package(art_root_io 1.08.03 REQUIRED EXPORT QUIET)
9696
find_package(art 3.09.03 REQUIRED EXPORT QUIET)

‎CMakePresets.json‎

Lines changed: 0 additions & 144 deletions
This file was deleted.

‎artdaq/Application/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ cet_make_library(LIBRARY_NAME_VAR APP_TARGET
3131
artdaq_plugin_support::CFGMaker
3232
artdaq_plugin_support::policyMaker
3333
artdaq::DAQdata
34-
artdaq_core::artdaq-core_Data
35-
artdaq_core::artdaq-core_Core
36-
artdaq_core::artdaq-core_Utilities
34+
artdaq-core::Data
35+
artdaq-core::Core
36+
artdaq-core::Utilities
3737
)
3838

3939
#process_smc(${APP_TARGET} OUTPUT_DIR detail detail/Commandable.sm)

‎artdaq/ArtModules/CMakeLists.txt‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cet_register_export_set(SET_NAME AMPluginTypes NAMESPACE artdaq_plugin_types)
1010
cet_make_library(LIBRARY_NAME ArtConfig INTERFACE
1111
SOURCE detail/ArtConfig.hh
1212
LIBRARIES INTERFACE
13-
artdaq_utilities::artdaq-utilities_Plugins
13+
artdaq-utilities::Plugins
1414
art::Framework_Core
1515
art::Framework_IO
1616
fhiclcpp::types
@@ -21,7 +21,7 @@ cet_make_library(LIBRARY_NAME ArtdaqSharedMemoryService INTERFACE
2121
EXPORT_SET AMPluginTypes
2222
SOURCE ArtdaqSharedMemoryServiceInterface.h
2323
LIBRARIES INTERFACE
24-
artdaq_core::artdaq-core_Data
24+
artdaq-core::Data
2525
art_plugin_types::serviceDeclaration
2626
TRACE::MF
2727
)
@@ -32,8 +32,8 @@ cet_build_plugin(ArtdaqSharedMemoryService art::service
3232
LIBRARIES PRIVATE
3333
artdaq_plugin_types::ArtdaqSharedMemoryService
3434
artdaq::DAQdata
35-
artdaq_core::artdaq-core_Core
36-
artdaq_core::artdaq-core_Utilities
35+
artdaq-core::Core
36+
artdaq-core::Utilities
3737
fhiclcpp::types
3838
fhiclcpp::fhiclcpp
3939
TRACE::MF
@@ -54,7 +54,7 @@ cet_make_library(SOURCE
5454
PUBLIC
5555
artdaq_plugin_types::commander
5656
artdaq_plugin_types::transfer
57-
artdaq_core::artdaq-core_Data
57+
artdaq-core::Data
5858
fhiclcpp::fhiclcpp
5959
TRACE::MF
6060
PRIVATE
@@ -69,8 +69,8 @@ cet_make_library(LIBRARY_NAME ArtdaqFragmentNamingService INTERFACE
6969
EXPORT_SET AMPluginTypes
7070
SOURCE ArtdaqFragmentNamingService.h
7171
LIBRARIES INTERFACE
72-
artdaq_core::artdaq-core_Plugins
73-
artdaq_core::artdaq-core_Data
72+
artdaq-core::Plugins
73+
artdaq-core::Data
7474
art_plugin_types::serviceDeclaration
7575
)
7676

@@ -83,52 +83,52 @@ cet_make_library(LIBRARY_NAME ArtdaqBuildInfo INTERFACE
8383
EXPORT_SET AMPluginTypes
8484
SOURCE ArtdaqBuildInfo_module.hh
8585
LIBRARIES INTERFACE
86-
artdaq_core::headers
86+
artdaq-core::headers
8787
art_plugin_types::EDProducer
8888
)
8989

9090
cet_build_plugin(ArtdaqBuildInfo art::EDProducer
9191
LIBRARIES PRIVATE
92-
artdaq_core::artdaq-core_BuildInfo
93-
artdaq_utilities::artdaq-utilities_BuildInfo
92+
artdaq-core::BuildInfo
93+
artdaq-utilities::BuildInfo
9494
artdaq::BuildInfo
9595
)
9696

9797
cet_build_plugin(EventDump art::EDAnalyzer
9898
LIBRARIES PRIVATE
99-
artdaq_core::artdaq-core_Data
99+
artdaq-core::Data
100100
)
101101

102102
cet_build_plugin(FragmentWatcher art::EDAnalyzer
103103
LIBRARIES PRIVATE
104104
artdaq::DAQdata
105-
artdaq_core::artdaq-core_Data
105+
artdaq-core::Data
106106
TRACE::MF
107107
)
108108

109109
cet_build_plugin(MissingDataCheck art::EDAnalyzer
110110
LIBRARIES PRIVATE
111-
artdaq_core::artdaq-core_Data
111+
artdaq-core::Data
112112
art_root_io::TFileService_service
113113
ROOT::Tree
114114
)
115115

116116
cet_build_plugin(PrintBuildInfo art::EDAnalyzer
117117
LIBRARIES PRIVATE
118-
artdaq_core::headers
118+
artdaq-core::headers
119119
TRACE::MF
120120
)
121121

122122
cet_build_plugin(RandomDelayFilter art::EDFilter
123123
LIBRARIES PRIVATE
124-
artdaq_core::artdaq-core_Utilities
124+
artdaq-core::Utilities
125125
TRACE::MF
126126
)
127127

128128
cet_build_plugin(RequestSender art::EDAnalyzer
129129
LIBRARIES PRIVATE
130130
artdaq::DAQrate
131-
artdaq_core::artdaq-core_Data
131+
artdaq-core::Data
132132
TRACE::MF
133133
)
134134

@@ -154,8 +154,8 @@ cet_make_library(LIBRARY_NAME ArtdaqInputHelper INTERFACE
154154
artdaq_plugin_types::ArtdaqSharedMemoryService
155155
artdaq::DAQdata
156156
artdaq::InputUtilities
157-
artdaq_core::artdaq-core_Data
158-
artdaq_core::artdaq-core_Utilities
157+
artdaq-core::Data
158+
artdaq-core::Utilities
159159
art_root_io::art_root_io
160160
art::Framework_Core
161161
art::Framework_IO_Sources
@@ -188,7 +188,7 @@ cet_make_library(LIBRARY_NAME ArtdaqOutput INTERFACE
188188
SOURCE ArtdaqOutput.hh
189189
LIBRARIES INTERFACE
190190
artdaq::DAQdata
191-
artdaq_core::artdaq-core_Data
191+
artdaq-core::Data
192192
art_root_io::art_root_io
193193
art::Framework_Core
194194
art::Framework_Principal
@@ -215,7 +215,7 @@ cet_build_plugin(BinaryNetOutput art::module
215215
artdaq::ArtdaqOutput
216216
artdaq::DAQrate
217217
artdaq::DAQdata
218-
artdaq_core::artdaq-core_Data
218+
artdaq-core::Data
219219
fhiclcpp::fhiclcpp
220220
TRACE::MF
221221
)
@@ -225,7 +225,7 @@ cet_build_plugin(BinaryFileOutput art::module
225225
artdaq::ArtdaqOutput
226226
artdaq::DAQrate
227227
artdaq::DAQdata
228-
artdaq_core::artdaq-core_Data
228+
artdaq-core::Data
229229
fhiclcpp::fhiclcpp
230230
TRACE::MF
231231
)

‎artdaq/BuildInfo/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/GetPackageBuildInfo.cc.in
2424
cet_make_library(
2525
SOURCE
2626
${CMAKE_CURRENT_BINARY_DIR}/GetPackageBuildInfo.cc
27-
LIBRARIES artdaq_core::artdaq-core_Data
27+
LIBRARIES artdaq-core::Data
2828
)
2929

3030
install_headers()

‎artdaq/DAQdata/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cet_make_library(SOURCE
44
TCPConnect.cc
55
TCP_listen_fd.cc
66
LIBRARIES PUBLIC
7-
artdaq_utilities::artdaq-utilities_Plugins
7+
artdaq-utilities::Plugins
88
fhiclcpp::types
99
Threads::Threads
1010
TRACE::MF
@@ -22,7 +22,7 @@ cet_build_plugin(GenericFragmentSimulator artdaq::generator
2222
LIBRARIES
2323
PUBLIC
2424
artdaq_plugin_types::generator
25-
artdaq_core::artdaq-core_Data
25+
artdaq-core::Data
2626
fhiclcpp::types
2727
PRIVATE
2828
fhiclcpp::fhiclcpp

‎artdaq/DAQrate/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ cet_make_library(SOURCE
2424
LIBRARIES
2525
PUBLIC
2626
artdaq::DAQdata
27-
artdaq_core::artdaq-core_Core
28-
artdaq_core::artdaq-core_Data
27+
artdaq-core::Core
28+
artdaq-core::Data
2929
TRACE::MF
3030
Boost::thread
3131
PRIVATE

‎artdaq/ExternalComms/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ cet_write_plugin_builder(artdaq::commander art::plugin Modules
3131
include(artdaq::commander)
3232
cet_build_plugin(xmlrpc artdaq::commander
3333
LIBRARIES PRIVATE
34-
artdaq_core::artdaq-core_Utilities
34+
artdaq-core::Utilities
3535
${XMLRPC_LIBRARIES}
3636
)
3737
target_include_directories(artdaq_ExternalComms_xmlrpc_commander

‎artdaq/Generators/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ cet_make_library(LIBRARY_NAME CommandableFragmentGenerator
1717
LIBRARIES
1818
PUBLIC
1919
artdaq::DAQrate
20-
artdaq_core::artdaq-core_Data
20+
artdaq-core::Data
2121
artdaq_plugin_types::generator
2222
fhiclcpp::types
2323
Boost::thread
2424
TRACE::MF
2525
Threads::Threads
2626
PRIVATE
27-
artdaq_core::artdaq-core_Utilities
27+
artdaq-core::Utilities
2828
fhiclcpp::fhiclcpp
2929
cetlib_except::cetlib_except
3030
)

‎artdaq/RoutingPolicies/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cet_make_library(LIBRARY_NAME policy
66
SOURCE RoutingManagerPolicy.cc
77
LIBRARIES
88
PUBLIC
9-
artdaq_core::artdaq-core_Data
9+
artdaq-core::Data
1010
PRIVATE
1111
artdaq::DAQdata
1212
fhiclcpp::fhiclcpp

0 commit comments

Comments
 (0)