diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md index 8eb3d7de6b291..3743b063d5823 100644 --- a/README/ReleaseNotes/v642/index.md +++ b/README/ReleaseNotes/v642/index.md @@ -10,8 +10,6 @@ For more information, see: [http://root.cern](http://root.cern) -The following people have contributed to this new version: - The following people have contributed to this new version: Bertrand Bellenot, CERN/EP-SFT,\ @@ -66,8 +64,9 @@ Users are encouraged to export their models to ONNX and use the retained ONNX pa * The **RooStats::DebuggingSampler** and **RooStats::DebuggingTestStat** classes are removed. They were mock implementations of the `TestStatSampler` and `TestStatistic` interfaces that returned uniform random numbers independent of the data, only meant for debugging the RooStats framework itself during its initial development. * The `RooTrace` class is deprecated and will be removed in ROOT 6.44. It was a RooFit-specific memory tracer whose instrumentation hooks are compiled out by default, so it has been inert and untested for years. For memory debugging, please use general-purpose tools such as AddressSanitizer or Valgrind instead. * Support for the AIX operating system has been removed from the codebase. This support has not been tested since the late v5 releases and the LLVM JIT is not yet supporting AIX. -* The headers Htypes.h and Gtypes.h that were deprecated in ROOT 6.20 will now emit warnings and will be fully removed in ROOT 6.44. -* The header GLConstants.h is no longer part of ROOT installed headers. +* The headers `Htypes.h` and `Gtypes.h` that were deprecated in ROOT 6.20 will now emit warnings and will be fully removed in ROOT 6.44. +* The header `GLConstants.h` is no longer part of ROOT installed headers. +* Including `RConfig.h` and `RVersion.h` is now deprecated and will be removed in 6.46, use instead `ROOT/RConfig.hxx` and `ROOT/RVersion.hxx`. ## Build System diff --git a/cmake/unix/module.modulemap b/cmake/unix/module.modulemap index 0c013e9e85c54..256b9eb9578fa 100644 --- a/cmake/unix/module.modulemap +++ b/cmake/unix/module.modulemap @@ -13,9 +13,7 @@ module ROOT_Foundation_C { // supposed to be textually expanded in each TU. module ROOT_Config { // These headers are supposed to be only textually expanded for each TU. - module "RVersion.h" { textual header "RVersion.h" export * } - module "RConfig.h" { header "RConfig.h" export * } - module "ROOT/RConfig.h" { header "ROOT/RConfig.h" export * } + module "ROOT/RVersion.hxx" { textual header "ROOT/RVersion.hxx" export * } module "ROOT/RConfig.hxx" { textual header "ROOT/RConfig.hxx" export * } module "RConfigure.h" { textual header "RConfigure.h" export * } // FIXME: There is little benefit in keeping DllImport as a separate header. diff --git a/core/base/inc/RConfig.h b/core/base/inc/RConfig.h index 9f84c71f141dc..55b8e3e871110 100644 --- a/core/base/inc/RConfig.h +++ b/core/base/inc/RConfig.h @@ -13,12 +13,13 @@ /************************************************************************* * * - * Old RConfig.h forwarding to ROOT/RConfig.hxx * + * Old RConfig.h forwarding to ROOT/RConfig.hxx * * * - * Please #include ROOT/RConfig.hxx instead, e.g. to avoid clashes with * + * Please #include ROOT/RConfig.hxx instead, e.g. to avoid clashes with * * R's Rconfig.h * * * *************************************************************************/ +#warning "RConfig.h is deprecated and will be removed in a future release, please include ROOT/RConfig.hxx instead" #include diff --git a/core/base/inc/TROOT.h b/core/base/inc/TROOT.h index db22582c668cd..e4fdef71d451c 100644 --- a/core/base/inc/TROOT.h +++ b/core/base/inc/TROOT.h @@ -125,7 +125,7 @@ friend TROOT *ROOT::Internal::GetROOT2(); TString fConfigFeatures; ///< ROOT ./configure detected build features TString fVersion; ///< ROOT version as TString, example: 0.05.01 Int_t fVersionInt = 0; ///< ROOT version in integer format (501) - Int_t fVersionCode = 0; ///< ROOT version code as used in RVersion.h + Int_t fVersionCode = 0; ///< ROOT version code as used in ROOT/RVersion.hxx Int_t fVersionDate = 0; ///< Date of ROOT version (ex 951226) Int_t fVersionTime = 0; ///< Time of ROOT version (ex 1152) Int_t fBuiltDate = 0; ///< Date of ROOT built diff --git a/core/base/inc/TVersionCheck.h b/core/base/inc/TVersionCheck.h index 04a9424a1af6c..4b369b6b9142d 100644 --- a/core/base/inc/TVersionCheck.h +++ b/core/base/inc/TVersionCheck.h @@ -12,7 +12,7 @@ #ifndef ROOT_TVersionCheck #define ROOT_TVersionCheck -#include "RVersion.h" +#include "ROOT/RVersion.hxx" /** \class TVersionCheck \ingroup Base diff --git a/core/base/src/TROOT.cxx b/core/base/src/TROOT.cxx index 397d04d376295..4603c0bf6979e 100644 --- a/core/base/src/TROOT.cxx +++ b/core/base/src/TROOT.cxx @@ -3101,7 +3101,7 @@ Int_t TROOT::ConvertVersionCode2Int(Int_t code) } //////////////////////////////////////////////////////////////////////////////// -/// Convert version as an integer to version code as used in RVersion.h. +/// Convert version as an integer to version code as used in ROOT/RVersion.hxx. Int_t TROOT::ConvertVersionInt2Code(Int_t v) { @@ -3112,7 +3112,7 @@ Int_t TROOT::ConvertVersionInt2Code(Int_t v) } //////////////////////////////////////////////////////////////////////////////// -/// Return ROOT version code as defined in RVersion.h. +/// Return ROOT version code as defined in ROOT/RVersion.hxx. Int_t TROOT::RootVersionCode() { diff --git a/core/base/src/TSystem.cxx b/core/base/src/TSystem.cxx index 5bdddc7e40501..bf312d7011747 100644 --- a/core/base/src/TSystem.cxx +++ b/core/base/src/TSystem.cxx @@ -2700,8 +2700,7 @@ static void R__WriteDependencyFile(const TString & build_loc, const TString &dep } #endif { - constexpr const char *dictHeaders[] = {"RVersion.h", - "ROOT/RConfig.hxx", + constexpr const char *dictHeaders[] = {"ROOT/RConfig.hxx", "TClass.h", "TDictAttributeMap.h", "TInterpreter.h", diff --git a/core/foundation/inc/ROOT/RConfig.h b/core/foundation/inc/ROOT/RConfig.h index af88a82ffc196..c70c728da50fc 100644 --- a/core/foundation/inc/ROOT/RConfig.h +++ b/core/foundation/inc/ROOT/RConfig.h @@ -20,6 +20,8 @@ * * *************************************************************************/ +#warning "RConfig.h is deprecated and will be removed in a future release, please include ROOT/RConfig.hxx instead" + #include #endif // ROOT_RConfig_fwd diff --git a/core/foundation/inc/ROOT/RConfig.hxx b/core/foundation/inc/ROOT/RConfig.hxx index 6f49eedae02f9..8c615be3d4076 100644 --- a/core/foundation/inc/ROOT/RConfig.hxx +++ b/core/foundation/inc/ROOT/RConfig.hxx @@ -19,7 +19,7 @@ * * *************************************************************************/ -#include "../RVersion.h" +#include "RVersion.hxx" #include "RConfigure.h" diff --git a/core/foundation/inc/ROOT/RVersion.hxx b/core/foundation/inc/ROOT/RVersion.hxx index 2f23b7c43bf71..c6bfe51433c28 100644 --- a/core/foundation/inc/ROOT/RVersion.hxx +++ b/core/foundation/inc/ROOT/RVersion.hxx @@ -7,6 +7,9 @@ #define ROOT_VERSION_PATCH 1 // When changing the version number here, never add leading zeroes! #define ROOT_RELEASE_DATE "Apr 23 2026" +/* not updated anymore */ +#define ROOT_RELEASE_TIME "00:00:00" + /* Don't change the lines below. */ /* diff --git a/core/foundation/inc/RVersion.h b/core/foundation/inc/RVersion.h index 31b06bb2660b1..b6ea95c80dd63 100644 --- a/core/foundation/inc/RVersion.h +++ b/core/foundation/inc/RVersion.h @@ -1,8 +1,8 @@ #ifndef ROOT_RVersion #define ROOT_RVersion -#include "ROOT/RVersion.hxx" +#warning "RVersion.h is deprecated and will be removed in a future release, please include ROOT/RVersion.hxx instead" -#define ROOT_RELEASE_TIME "00:00:00" /* not updated anymore */ +#include "ROOT/RVersion.hxx" #endif diff --git a/core/winnt/src/Win32Splash.cxx b/core/winnt/src/Win32Splash.cxx index 7868d777df83b..94ff3abb610af 100644 --- a/core/winnt/src/Win32Splash.cxx +++ b/core/winnt/src/Win32Splash.cxx @@ -10,7 +10,7 @@ *************************************************************************/ #ifdef WIN32 -#include "RVersion.h" +#include "ROOT/RVersion.hxx" #include "strlcpy.h" #include #include diff --git a/hist/unfold/src/TUnfoldSys.cxx b/hist/unfold/src/TUnfoldSys.cxx index 3c2817364f479..5fd00175a1ae5 100644 --- a/hist/unfold/src/TUnfoldSys.cxx +++ b/hist/unfold/src/TUnfoldSys.cxx @@ -156,7 +156,7 @@ INCLUDED in the methods provided by the base class TUnfold. #include #include #include -#include +#include #include #include "TUnfoldSys.h" diff --git a/io/io/src/RRawFile.cxx b/io/io/src/RRawFile.cxx index 58d54daacf064..9c7c501670c87 100644 --- a/io/io/src/RRawFile.cxx +++ b/io/io/src/RRawFile.cxx @@ -9,7 +9,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#include +#include #include #ifdef _WIN32 #include diff --git a/math/mathcore/test/fit/testMinim.cxx b/math/mathcore/test/fit/testMinim.cxx index fdf549b0fc21f..a27da45aab2ea 100644 --- a/math/mathcore/test/fit/testMinim.cxx +++ b/math/mathcore/test/fit/testMinim.cxx @@ -19,7 +19,7 @@ #include "TRandom3.h" #include "TMath.h" -#include "RVersion.h" +#include "ROOT/RVersion.hxx" #include "RConfigure.h" //#define DEBUG diff --git a/misc/win/makeresource.sh b/misc/win/makeresource.sh index aab7d3e63715f..7054993620795 100755 --- a/misc/win/makeresource.sh +++ b/misc/win/makeresource.sh @@ -36,7 +36,7 @@ GITDATE="`cat etc/gitinfo.txt|tail -n1`" GITYEARCOMMA=`echo $GITDATE|cut -d' ' -f3` # Can't do that inside the .rc file: FILEVERSION doesn't evaluate a>>b -VERSION=`grep "ROOT_RELEASE " include/RVersion.h | sed 's,^.*"\([^"]*\)".*$,\1,' | sed 's,[^[:digit:]], ,g'` +VERSION=`grep "ROOT_RELEASE " include/ROOT/RVersion.hxx | sed 's,^.*"\([^"]*\)".*$,\1,' | sed 's,[^[:digit:]], ,g'` VER1=`echo $VERSION| cut -d ' ' -f 1| sed 's,^0,,'` VER2=`echo $VERSION| cut -d ' ' -f 2| sed 's,^0,,'` VER3=`echo $VERSION| cut -d ' ' -f 3| sed 's,^0,,'` diff --git a/roofit/roofitcore/inc/RooFit/Evaluator.h b/roofit/roofitcore/inc/RooFit/Evaluator.h index f50424c634abf..ce6b57bf7c8cd 100644 --- a/roofit/roofitcore/inc/RooFit/Evaluator.h +++ b/roofit/roofitcore/inc/RooFit/Evaluator.h @@ -17,7 +17,7 @@ #include #include -#include +#include #include diff --git a/roofit/roofitcore/inc/RooFitResult.h b/roofit/roofitcore/inc/RooFitResult.h index 0eabae7df175e..dc912a7a12960 100644 --- a/roofit/roofitcore/inc/RooFitResult.h +++ b/roofit/roofitcore/inc/RooFitResult.h @@ -21,7 +21,7 @@ #include "RooDirItem.h" #include "RooArgList.h" -#include "RVersion.h" +#include "ROOT/RVersion.hxx" #include "TMatrixFfwd.h" #include "TMatrixDSym.h" #include "TList.h" diff --git a/roofit/xroofit/src/xRooFit.cxx b/roofit/xroofit/src/xRooFit.cxx index ddde2f9beb4af..6a526d549b289 100644 --- a/roofit/xroofit/src/xRooFit.cxx +++ b/roofit/xroofit/src/xRooFit.cxx @@ -10,7 +10,7 @@ * listed in LICENSE (http://roofit.sourceforge.net/license.txt) */ -#include "RVersion.h" +#include "ROOT/RVersion.hxx" // #define private public // #include "Minuit2/Minuit2Minimizer.h" diff --git a/roofit/xroofit/src/xRooNLLVar.cxx b/roofit/xroofit/src/xRooNLLVar.cxx index 4fcb5f1228e9f..7066b2c0df865 100644 --- a/roofit/xroofit/src/xRooNLLVar.cxx +++ b/roofit/xroofit/src/xRooNLLVar.cxx @@ -17,7 +17,7 @@ This xRooNLLVar object has several special methods, e.g. for fitting and toy dat */ -#include "RVersion.h" +#include "ROOT/RVersion.hxx" #if ROOT_VERSION_CODE < ROOT_VERSION(6, 27, 00) #define protected public diff --git a/roofit/xroofit/src/xRooNode.cxx b/roofit/xroofit/src/xRooNode.cxx index 9a6d815cd7562..1e8a56f25fa8f 100644 --- a/roofit/xroofit/src/xRooNode.cxx +++ b/roofit/xroofit/src/xRooNode.cxx @@ -42,7 +42,7 @@ exploring the content are: */ -#include "RVersion.h" +#include "ROOT/RVersion.hxx" #if ROOT_VERSION_CODE < ROOT_VERSION(6, 27, 00) diff --git a/roottest/cling/dict/mapTest.C b/roottest/cling/dict/mapTest.C index b85b5df4cc112..68f05f688e5f7 100644 --- a/roottest/cling/dict/mapTest.C +++ b/roottest/cling/dict/mapTest.C @@ -1,6 +1,6 @@ #include #include "MyTemplateTestClass.h" -#include "RConfig.h" +#include "ROOT/RConfig.hxx" void mapTest() { diff --git a/roottest/root/io/newstl/versions.h b/roottest/root/io/newstl/versions.h index 2ab47a75a3ba1..51c3803fd87db 100644 --- a/roottest/root/io/newstl/versions.h +++ b/roottest/root/io/newstl/versions.h @@ -1,7 +1,7 @@ #ifndef VERSION_H #define VERSION_H -#include "RVersion.h" +#include "ROOT/RVersion.hxx" #include "TFile.h" #include "TestOutput.h" diff --git a/roottest/root/meta/dictSelection/DictSelection.h b/roottest/root/meta/dictSelection/DictSelection.h index e3edc36b0f4e6..0b9773ee5e847 100644 --- a/roottest/root/meta/dictSelection/DictSelection.h +++ b/roottest/root/meta/dictSelection/DictSelection.h @@ -6,7 +6,7 @@ This test has been provided by Attila Krasznahorkay. #define DICTRULES_DICTSELECTION_H // Get the active ROOT version: -#include +#include // Include the correct header: #if ROOT_VERSION_CODE < ROOT_VERSION( 5, 99, 00 ) diff --git a/roottest/root/meta/genreflex/ROOT-5768/CoolKernel/VersionInfo.h b/roottest/root/meta/genreflex/ROOT-5768/CoolKernel/VersionInfo.h index 581dde867bf65..b7d9b52e799ad 100644 --- a/roottest/root/meta/genreflex/ROOT-5768/CoolKernel/VersionInfo.h +++ b/roottest/root/meta/genreflex/ROOT-5768/CoolKernel/VersionInfo.h @@ -48,7 +48,7 @@ // Define a portable macro for c++11 in COOL (only for COOL290 and ROOT6!) #ifdef COOL290 #if defined(__GXX_EXPERIMENTAL_CXX0X) || __cplusplus >= 201103L -#include "RVersion.h" +#include "ROOT/RVersion.hxx" #if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0) #define COOL_HAS_CPP11 1 #else diff --git a/roottest/root/meta/genreflex/ROOT-5768/PyCool.h b/roottest/root/meta/genreflex/ROOT-5768/PyCool.h index 014215c887c95..a3eb80a1cd13f 100644 --- a/roottest/root/meta/genreflex/ROOT-5768/PyCool.h +++ b/roottest/root/meta/genreflex/ROOT-5768/PyCool.h @@ -6,7 +6,7 @@ #include "CoolKernel/VersionInfo.h" // Port to ROOT6 (bug #102630) - remove Reflex dependency -#include "RVersion.h" +#include "ROOT/RVersion.hxx" // Disable vector payload in PyCool for ROOT6 (workaround for bug #103017) //#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0) diff --git a/test/Event.cxx b/test/Event.cxx index 45af8214e893a..88f15d92f4d67 100644 --- a/test/Event.cxx +++ b/test/Event.cxx @@ -78,7 +78,7 @@ // //////////////////////////////////////////////////////////////////////// -#include "RVersion.h" +#include "ROOT/RVersion.hxx" #include "TRandom.h" #include "TDirectory.h" #include "TProcessID.h" diff --git a/tmva/tmvagui/inc/TMVA/tmvaglob.h b/tmva/tmvagui/inc/TMVA/tmvaglob.h index fe1109e4121df..44ff45f1b1f66 100644 --- a/tmva/tmvagui/inc/TMVA/tmvaglob.h +++ b/tmva/tmvagui/inc/TMVA/tmvaglob.h @@ -23,7 +23,7 @@ #include "TText.h" #include "TLegend.h" -#include "RVersion.h" +#include "ROOT/RVersion.hxx" namespace TMVA{ diff --git a/tree/ntuple/src/RNTupleSerialize.cxx b/tree/ntuple/src/RNTupleSerialize.cxx index bcd0476f49417..d30c61d98b08a 100644 --- a/tree/ntuple/src/RNTupleSerialize.cxx +++ b/tree/ntuple/src/RNTupleSerialize.cxx @@ -18,8 +18,8 @@ #include #include #include +#include -#include #include #include #include diff --git a/tree/ntuple/src/RPageStorageDaos.cxx b/tree/ntuple/src/RPageStorageDaos.cxx index 7e5651f8d6761..364dd107f3110 100644 --- a/tree/ntuple/src/RPageStorageDaos.cxx +++ b/tree/ntuple/src/RPageStorageDaos.cxx @@ -26,8 +26,8 @@ #include #include #include +#include -#include #include #include diff --git a/tree/ntuple/src/RPageStorageFile.cxx b/tree/ntuple/src/RPageStorageFile.cxx index 1bed89eb78c56..cdd00e977c40d 100644 --- a/tree/ntuple/src/RPageStorageFile.cxx +++ b/tree/ntuple/src/RPageStorageFile.cxx @@ -24,8 +24,8 @@ #include #include #include +#include -#include #include #include #include