Skip to content

Remove old classes of CCDB #2428

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

Merged
sawenzel merged 7 commits into from
Oct 2, 2019
Merged

Remove old classes of CCDB #2428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21d4e64
Remove old classes of CCDB (does not compile yet)
Barthelemy Sep 23, 2019
aa28988
fix for event visualization
Barthelemy Sep 24, 2019
68824a7
Changes for TPC (TestTPCCDBInterface disabled)
Barthelemy Sep 24, 2019
e548029
format
Barthelemy Sep 24, 2019
fc5a08f
missing file
Barthelemy Sep 24, 2019
bb9edab
add doxygen and trigger new build
Barthelemy Oct 1, 2019
66e31bb
format
Barthelemy Oct 1, 2019
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
91 changes: 15 additions & 76 deletions CCDB/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,86 +9,25 @@
# submit itself to any jurisdiction.

o2_add_library(CCDB
SOURCES src/Backend.cxx
src/BackendOCDB.cxx
src/BackendRiak.cxx
src/Condition.cxx
src/ConditionId.cxx
src/ConditionMetaData.cxx
src/FileStorage.cxx
src/GridStorage.cxx
src/IdPath.cxx
src/IdRunRange.cxx
src/LocalStorage.cxx
src/Manager.cxx
src/ObjectHandler.cxx
src/Storage.cxx
src/XmlHandler.cxx
src/CcdbApi.cxx
src/ConditionsMQServer.cxx
src/ConditionsMQClient.cxx
src/BasicCCDBManager.cxx
src/CCDBTimeStampUtils.cxx
src/request.proto
PUBLIC_LINK_LIBRARIES FairMQ::FairMQ
protobuf::libprotobuf
ROOT::Hist
ROOT::XMLParser
O2::CommonUtils
FairRoot::ParMQ
O2::Device
CURL::libcurl
Boost::thread
SOURCES src/CcdbApi.cxx
src/BasicCCDBManager.cxx
src/CCDBTimeStampUtils.cxx
src/IdPath.cxx
PUBLIC_LINK_LIBRARIES CURL::libcurl
FairRoot::ParMQ
ROOT::Hist
O2::Device
O2::CommonUtils
FairMQ::FairMQ
TARGETVARNAME targetName)

protobuf_generate(TARGET ${targetName})

o2_target_root_dictionary(CCDB
HEADERS include/CCDB/Backend.h
include/CCDB/BackendOCDB.h
include/CCDB/BackendRiak.h
include/CCDB/Condition.h
include/CCDB/ConditionId.h
include/CCDB/ConditionMetaData.h
include/CCDB/FileStorage.h
include/CCDB/GridStorage.h
include/CCDB/IdPath.h
include/CCDB/IdRunRange.h
include/CCDB/LocalStorage.h
include/CCDB/Manager.h
include/CCDB/ObjectHandler.h
include/CCDB/Storage.h
include/CCDB/XmlHandler.h
include/CCDB/TObjectWrapper.h
HEADERS
include/CCDB/CcdbApi.h
include/CCDB/BasicCCDBManager.h
include/CCDB/CCDBTimeStampUtils.h
test/TestClass.h)

o2_add_executable(conditions-server
SOURCES src/runConditionsServer.cxx
COMPONENT_NAME ccdb
PUBLIC_LINK_LIBRARIES O2::CCDB)

o2_add_executable(conditions-client
SOURCES src/runConditionsClient.cxx
COMPONENT_NAME ccdb
PUBLIC_LINK_LIBRARIES O2::CCDB)

o2_add_executable(standalone-client
SOURCES test/testQueryServerStandalone.cxx
COMPONENT_NAME ccdb
PUBLIC_LINK_LIBRARIES O2::CCDB)

o2_data_file(COPY config/conditions-server.json config/conditions-client.json
example/fill_local_ocdb.C
DESTINATION config)

o2_add_test(WriteReadAny
SOURCES test/testWriteReadAny.cxx
COMPONENT_NAME ccdb
PUBLIC_LINK_LIBRARIES O2::CCDB
LABELS ccdb)
include/CCDB/TObjectWrapper.h
include/CCDB/IdPath.h
include/CCDB/BasicCCDBManager.h
include/CCDB/CCDBTimeStampUtils.h)

o2_add_test(CcdbApi
SOURCES test/testCcdbApi.cxx
Expand Down
34 changes: 0 additions & 34 deletions CCDB/config/conditions-client.json
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions CCDB/config/conditions-server.json
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions CCDB/example/fill_local_ocdb.C
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions CCDB/include/CCDB/Backend.h
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions CCDB/include/CCDB/BackendOCDB.h
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions CCDB/include/CCDB/BackendRiak.h
View file
Open in desktop

This file was deleted.

Loading