Skip to content

Commit

Permalink
Deprecate DataMatch library
Browse files Browse the repository at this point in the history
Scheduled the library to be removed in a future major release of FairRoot.

Addresses issue #1270.

(cherry picked from commit da6362b)
  • Loading branch information
karabowi committed Nov 25, 2022
1 parent e342df3 commit 8a75c8b
Show file tree
Hide file tree
Showing 12 changed files with 47 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ file an issue, so that we can see how to handle this.
* Many items were already deprecated in prior versions.
Marked them with proper C++14 deprecation warnings.
Scheduled them for removal in v20.
* Deprecated DataMatch library
* Contact the developers should you need it.
* Scheduled to remove without replacement in a future major release of FairRoot.

### Other Notable Changes
* CMake [targets](https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html)
Expand Down
4 changes: 4 additions & 0 deletions datamatch/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ target_link_libraries(${target} PUBLIC
ROOT::Core
)

target_compile_definitions(${target} PRIVATE
FAIR_SILENCE_DATAMATCH_DEPRECATION
)

fairroot_target_root_dictionary(${target}
HEADERS ${headers}
LINKDEF LinkDef.h
Expand Down
4 changes: 4 additions & 0 deletions datamatch/FairMCDataCrawler.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#ifndef FAIRMCDATACRAWLER_H_
#define FAIRMCDATACRAWLER_H_

#ifndef FAIR_SILENCE_DATAMATCH_DEPRECATION
#warning "FairRoot::DataMatch is deprecated and will be removed in a future major release"
#endif

#include "FairMultiLinkedData.h" // for FairMultiLinkedData

#include <Rtypes.h> // for Int_t, Bool_t, etc
Expand Down
4 changes: 4 additions & 0 deletions datamatch/FairMCEntry.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#ifndef FAIRMCENTRY_H_
#define FAIRMCENTRY_H_

#ifndef FAIR_SILENCE_DATAMATCH_DEPRECATION
#warning "FairRoot::DataMatch is deprecated and will be removed in a future major release"
#endif

#include "FairLink.h" // for FairLink
#include "FairMultiLinkedData.h" // for FairMultiLinkedData

Expand Down
4 changes: 4 additions & 0 deletions datamatch/FairMCList.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#ifndef FAIRMCLIST_H_
#define FAIRMCLIST_H_

#ifndef FAIR_SILENCE_DATAMATCH_DEPRECATION
#warning "FairRoot::DataMatch is deprecated and will be removed in a future major release"
#endif

#include <Rtypes.h> // for Int_t, FairMCList::Class, etc
#include <TObject.h> // for TObject
#include <vector> // for vector
Expand Down
4 changes: 4 additions & 0 deletions datamatch/FairMCMatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#ifndef FAIRMCMATCH_H_
#define FAIRMCMATCH_H_

#ifndef FAIR_SILENCE_DATAMATCH_DEPRECATION
#warning "FairRoot::DataMatch is deprecated and will be removed in a future major release"
#endif

#include "FairMCEntry.h" // for FairMCEntry
#include "FairMCResult.h" // for FairMCResult
#include "FairMCStage.h" // for FairMCStage
Expand Down
4 changes: 4 additions & 0 deletions datamatch/FairMCMatchCreatorTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
#ifndef FAIRMCMATCHCREATORTASK_H
#define FAIRMCMATCHCREATORTASK_H

#ifndef FAIR_SILENCE_DATAMATCH_DEPRECATION
#warning "FairRoot::DataMatch is deprecated and will be removed in a future major release"
#endif

#include "FairTask.h" // for InitStatus, FairTask

#include <Rtypes.h> // for Bool_t, etc
Expand Down
4 changes: 4 additions & 0 deletions datamatch/FairMCMatchLoaderTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
#ifndef FAIRMCMATCHLOADERTASK_H
#define FAIRMCMATCHLOADERTASK_H

#ifndef FAIR_SILENCE_DATAMATCH_DEPRECATION
#warning "FairRoot::DataMatch is deprecated and will be removed in a future major release"
#endif

#include "FairTask.h" // for FairTask, InitStatus

#include <Rtypes.h> // for ClassDef
Expand Down
4 changes: 4 additions & 0 deletions datamatch/FairMCMatchSelectorTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
#ifndef FAIRMCMATCHSELECTORTASK_H
#define FAIRMCMATCHSELECTORTASK_H

#ifndef FAIR_SILENCE_DATAMATCH_DEPRECATION
#warning "FairRoot::DataMatch is deprecated and will be removed in a future major release"
#endif

#include "FairTask.h" // for FairTask, InitStatus

#include <Rtypes.h> // for Int_t, Float_t, etc
Expand Down
4 changes: 4 additions & 0 deletions datamatch/FairMCObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#ifndef FAIRMCOBJECT_H_
#define FAIRMCOBJECT_H_

#ifndef FAIR_SILENCE_DATAMATCH_DEPRECATION
#warning "FairRoot::DataMatch is deprecated and will be removed in a future major release"
#endif

#include "FairLink.h" // for FairLink
#include "FairMCEntry.h" // for FairMCEntry
#include "FairMultiLinkedData.h" // for FairMultiLinkedData
Expand Down
4 changes: 4 additions & 0 deletions datamatch/FairMCResult.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#ifndef FAIRMCRESULT_H_
#define FAIRMCRESULT_H_

#ifndef FAIR_SILENCE_DATAMATCH_DEPRECATION
#warning "FairRoot::DataMatch is deprecated and will be removed in a future major release"
#endif

#include "FairMCEntry.h" // for FairMCEntry
#include "FairMCObject.h" // for FairMCObject

Expand Down
4 changes: 4 additions & 0 deletions datamatch/FairMCStage.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#ifndef FAIRMCSTAGE_H_
#define FAIRMCSTAGE_H_

#ifndef FAIR_SILENCE_DATAMATCH_DEPRECATION
#warning "FairRoot::DataMatch is deprecated and will be removed in a future major release"
#endif

#include "FairMCObject.h" // for FairMCObject

#include <Rtypes.h> // for Bool_t, Double_t, etc
Expand Down

0 comments on commit 8a75c8b

Please sign in to comment.