Implemented new static method TROOT::GetTutorialsDir() to return the actual location of the tutorials in the installation (see ROOT-6477). Adapted some tutorials to make use of it.

Author: peremato

core/base/inc/TROOT.h

@@ -315,6 +315,7 @@ friend TROOT *ROOT::GetROOT2();
    static Int_t       ConvertVersionInt2Code(Int_t v);
    static Int_t       RootVersionCode();
    static const char**&GetExtraInterpreterArgs();
+   static const char *GetTutorialsDir();
 
    ClassDef(TROOT,0)  //Top level (or root) structure for all classes
 };

core/base/src/TROOT.cxx

@@ -2447,3 +2447,16 @@ const char**& TROOT::GetExtraInterpreterArgs() {
    static const char** extraInterpArgs = 0;
    return extraInterpArgs;
 }
+
+//______________________________________________________________________________
+const char *TROOT::GetTutorialsDir()
+{
+   // Get the tuorials directory in the installtion. Static utility function.
+   
+#ifdef ROOTTUTDIR
+   return ROOTTUTDIR;
+#else
+   static TString tutdir = TString(gRootDir) + "/tutorials";
+   return tutdir;
+#endif
+}

core/doc/v604/index.md

@@ -1,8 +1,12 @@
 ## Core Libraries
 
-### Interpreter
-
+<h4>Interpreter</h4>
+<p>
 The new interface `TInterpreter::Declare(const char* code)` will declare the
 code to the interpreter with all interpreter extensions disabled, i.e. as
 "proper" C++ code. No autoloading or synamic lookup will be performed.
 
+<h4>TROOT</h4>
+<p>
+Implemented new gROOT->GetTutorialsDir() static method to return the actual location of the tutorials directory.
+This is $ROOTSYS/tutorials when not configuring with --prefix  or -Dgnuinstall for CMake.

graf2d/asimage/src/TASImage.cxx

@@ -389,11 +389,11 @@ static void init_icon_paths()
    gIconPaths[3] = StrDup(guiIcons.Data());
 
 #ifdef ROOTICONPATH
-   gIconPaths[4] = ROOTICONPATH;
+   gIconPaths[4] = StrDup(ROOTICONPATH);
 #endif
 
 #ifdef EXTRAICONPATH
-   gIconPaths[5] = EXTRAICONPATH;
+   gIconPaths[5] = StrDup(EXTRAICONPATH);
 #endif
 
    gIconPaths[6] = 0;

rootx/src/rootx.cxx

@@ -198,6 +198,7 @@ static STRUCT_UTMP *SearchEntry(int n, const char *tty)
    return 0;
 }
 
+#ifndef ROOTPREFIX
 static const char *GetExePath()
 {
    static std::string exepath;
@@ -244,6 +245,7 @@ static void SetRootSys()
       delete [] ep;
    }
 }
+#endif
 
 static void SetDisplay()
 {

tutorials/io/mergeSelective.C

@@ -37,7 +37,7 @@ void mergeSelective(Int_t nfiles=5)
    // Create the files to be merged
    TStopwatch timer;
    timer.Start();
-   if (gROOT->LoadMacro("$ROOTSYS/tutorials/hsimple.C")) return;
+   if (gROOT->LoadMacro(tutdir + "/hsimple.C")) return;
    Int_t i;
    for (i=0; i<nfiles; i++) CreateFile(Form("tomerge%03d.root",i));
 

tutorials/io/testMergeCont.C

@@ -6,7 +6,8 @@ void testMergeCont()
 {
    // Macro to test merging of containers.
 
-   gROOT->LoadMacro("$ROOTSYS/tutorials/hsimple.C");
+   TString tutdir = gROOT->GetTutorialsDir();
+   gROOT->LoadMacro(tutdir+"/hsimple.C");
    TList *list = (TList *)GetCollection();
    TList *inputs = new TList();
    for (Int_t i=0; i<10; i++) {

tutorials/tree/jets.C

@@ -90,7 +90,8 @@ void jets(Int_t nev=100, Int_t npileup=200, Bool_t secondrun = true) {
 //void jets(Int_t nev=100, Int_t npileup=200, Bool_t secondrun);
 void jets(Int_t nev=100, Int_t npileup=200) {
    gSystem->Load("libPhysics");
-   gROOT->ProcessLine(".L $ROOTSYS/tutorials/tree/JetEvent.cxx+");
+   TString tutdir = gROOT->GetTutorialsDir();
+   gROOT->ProcessLine(".L " + tutdir + "/tree/JetEvent.cxx+");
    gROOT->ProcessLine("#define JETS_SECOND_RUN yes");
    gROOT->ProcessLine("#include \"" __FILE__ "\"");
    gROOT->ProcessLine("jets(100,200,true)");