From 6e6feb0c07f821a7ea42670f20271fddd8dd1ff2 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Wed, 20 Nov 2013 15:37:13 +0100
Subject: [PATCH] Bug fixes.
---
html/src/TDocDirective.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/html/src/TDocDirective.cxx b/html/src/TDocDirective.cxx
index 9fe26b30655..8c244518c60 100644
--- a/html/src/TDocDirective.cxx
+++ b/html/src/TDocDirective.cxx
@@ -252,7 +252,7 @@ TDocMacroDirective::~TDocMacroDirective()
//______________________________________________________________________________
void TDocMacroDirective::SubProcess(const TString& what, const TString& out) {
Int_t error = TInterpreter::kNoError;
- Long_t ret = gROOT->ProcessLine(what, &error);
+ Long_t ret = gROOT->ProcessLine(TString(".x ") + what, &error);
Int_t sleepCycles = 50; // 50 = 5 seconds
while (error == TInterpreter::kProcessing && --sleepCycles > 0)
gSystem->Sleep(100);
@@ -460,7 +460,7 @@ Bool_t TDocMacroDirective::GetResult(TString& result)
}
TString subProcInputFile = CreateSubprocessInputFile();
- if (subProcInputFile.IsEmpty()) return kFALSE;
+ if (!subProcInputFile.Length()) return kFALSE;
subProcInputFile.ReplaceAll("\\", "\\\\");
subProcInputFile.ReplaceAll("\"", "\\\"");
@@ -468,7 +468,7 @@ Bool_t TDocMacroDirective::GetResult(TString& result)
if (wantBatch) {
invoc += "-b ";
}
- invoc += "-E 'TDocMacroDirective::SubProcess(\""
+ invoc += "-e 'TDocMacroDirective::SubProcess(\""
+ subProcInputFile + "\",\"" + outFileName + "\");'";
gSystem->Unlink(outFileName);
Int_t exitCode = gSystem->Exec(invoc.Data());
--
GitLab