From: cascade Date: Fri, 13 Feb 2009 18:33:58 +0000 (+0000) Subject: OCC20850 umake command do not work on SunOS10 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=af9e5646fef05d4c05700cfb093da978badbafdc;p=occt-wok.git OCC20850 umake command do not work on SunOS10 --- diff --git a/src/WOKMake/WOKMake_BuildProcess.cxx b/src/WOKMake/WOKMake_BuildProcess.cxx index bf3a7f7..e758b1a 100755 --- a/src/WOKMake/WOKMake_BuildProcess.cxx +++ b/src/WOKMake/WOKMake_BuildProcess.cxx @@ -81,7 +81,7 @@ Standard_Boolean WOKMake_BuildProcess::ComputeSteps(const Handle(WOKernel_DevUni if(groups.IsNull()) { - ErrorMsg << "WOKMake_BuildProcess::ComputeSteps" + ErrorMsg() << "WOKMake_BuildProcess::ComputeSteps" << "Could not eval %WOKSteps_Groups setting build process groups" << endm; return Standard_True; } @@ -122,7 +122,7 @@ Standard_Boolean WOKMake_BuildProcess::ComputeSteps(const Handle(WOKernel_DevUni } else { - ErrorMsg << "WOKMake_BuildProcess::ComputeSteps" + ErrorMsg() << "WOKMake_BuildProcess::ComputeSteps" << "Could not build step " << step << " for unit " << aunit->Name() << endm; } j++; @@ -131,7 +131,7 @@ Standard_Boolean WOKMake_BuildProcess::ComputeSteps(const Handle(WOKernel_DevUni } else { - WarningMsg << "WOKMake_BuildProcess::ComputeSteps" + WarningMsg() << "WOKMake_BuildProcess::ComputeSteps" << "Could not eval step group " << group << " (%WOKSteps_" << group << "Group" << ")" << endm; } @@ -265,7 +265,7 @@ Handle(WOKMake_Step) WOKMake_BuildProcess::GetStepFromID(const Handle(TCollectio if(result.IsNull()) { - ErrorMsg << "WOKMake_BuildProcess::GetStepFromID" + ErrorMsg() << "WOKMake_BuildProcess::GetStepFromID" << "Cannot get step " << acode << " for unit " << aunit->Name() << " (type : " << aunit->Type() << ")" << endm; return result; } @@ -273,7 +273,7 @@ Handle(WOKMake_Step) WOKMake_BuildProcess::GetStepFromID(const Handle(TCollectio } else { - ErrorMsg << "WOKMake_BuildProcess::GetStepFromID" + ErrorMsg() << "WOKMake_BuildProcess::GetStepFromID" << "Cannot locate dev unit : " << uname << endm; return result; } @@ -304,7 +304,7 @@ const Handle(WOKMake_Step)& WOKMake_BuildProcess::GetAndAddStep(const Handle(WOK if(myunits.IsBound(aunit->Name()) && asubcode.IsNull()) { - WarningMsg << "WOKMake_BuildProcess::GetAndAddStep" + WarningMsg() << "WOKMake_BuildProcess::GetAndAddStep" << "Cannot get step (" << acode << ") for unit " << aunit->Name() << " (type : " << aunit->Type() << ")" << endm; // return NULLRESULT; } @@ -319,7 +319,7 @@ const Handle(WOKMake_Step)& WOKMake_BuildProcess::GetAndAddStep(const Handle(WOK } else { - ErrorMsg << "WOKMake_BuildProcess::GetAndAddStep" + ErrorMsg() << "WOKMake_BuildProcess::GetAndAddStep" << "Cannot get step " << acode << " for unit " << aunit->Name() << " (type : " << aunit->Type() << ")" << endm; return NULLRESULT; } diff --git a/src/WOKMake/WOKMake_BuildProcessIterator.cxx b/src/WOKMake/WOKMake_BuildProcessIterator.cxx index d3857a8..91d4289 100755 --- a/src/WOKMake/WOKMake_BuildProcessIterator.cxx +++ b/src/WOKMake/WOKMake_BuildProcessIterator.cxx @@ -124,7 +124,7 @@ WOKMake_Status WOKMake_BuildProcessIterator::MakeStep() if(step.IsNull()) { - ErrorMsg << "WOKMake_BuildProcessIterator::MakeStep" + ErrorMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Invalid NULL step in iterator" << endm; mystatus = WOKMake_Failed; return mystatus; @@ -140,7 +140,7 @@ WOKMake_Status WOKMake_BuildProcessIterator::MakeStep() if(precstep.IsNull()) { - ErrorMsg << "WOKMake_BuildProcessIterator::MakeStep" + ErrorMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Could not find precedence step : " << precsteps->Value(i) << endm; mystatus = WOKMake_Failed; return mystatus; @@ -150,7 +150,7 @@ WOKMake_Status WOKMake_BuildProcessIterator::MakeStep() { case WOKMake_Failed: case WOKMake_Incomplete: - ErrorMsg << "WOKMake_BuildProcessIterator::MakeStep" + ErrorMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " not done : almost " << precsteps->Value(i) << " failed" << endm; if(myprocessed.Contains(step->Unit()->Name())) myprocessed.Remove(step->Unit()->Name()); step->SetStatus(WOKMake_Failed); @@ -166,7 +166,7 @@ WOKMake_Status WOKMake_BuildProcessIterator::MakeStep() WOKTools_MsgStreamPtr astream = NULL; Handle(WOKernel_File) logfile; - WOKTools_Info theinfo = InfoMsg; + WOKTools_Info theinfo = InfoMsg(); if(!mylogflag) { @@ -192,10 +192,10 @@ WOKMake_Status WOKMake_BuildProcessIterator::MakeStep() if(astream->good()) { - InfoMsg.LogToStream(astream); - WarningMsg.LogToStream(astream); - ErrorMsg.LogToStream(astream); - VerboseMsg.LogToStream(astream); + InfoMsg().LogToStream(astream); + WarningMsg().LogToStream(astream); + ErrorMsg().LogToStream(astream); + VerboseMsg().LogToStream(astream); } } @@ -220,7 +220,7 @@ WOKMake_Status WOKMake_BuildProcessIterator::MakeStep() if(E->IsKind(STANDARD_TYPE(OSD_Exception_CTRL_BREAK))) #endif { - ErrorMsg << "WOKMake_BuildProcessIterator::MakeStep" << "Process received interupt signal" << endm; + ErrorMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Process received interupt signal" << endm; WOKUtils_ProcessManager::KillAll(); mygrpidx = myprocess->Groups().Extent()+1; @@ -230,17 +230,17 @@ WOKMake_Status WOKMake_BuildProcessIterator::MakeStep() Standard_SStream astream; astream << E << ends; - ErrorMsg << "WOKMake_BuildProcessIterator::MakeStep" << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Exception was raised : " << GetSString(astream) << endm; } } if(mylogflag && astream) { - InfoMsg.EndLogging(); - WarningMsg.EndLogging(); - ErrorMsg.EndLogging(); - VerboseMsg.EndLogging(); + InfoMsg().EndLogging(); + WarningMsg().EndLogging(); + ErrorMsg().EndLogging(); + VerboseMsg().EndLogging(); astream->close(); delete astream; } @@ -266,26 +266,26 @@ WOKMake_Status WOKMake_BuildProcessIterator::MakeStep() case WOKMake_Incomplete: if(myprocessed.Contains(step->Unit()->Name())) myprocessed.Remove(step->Unit()->Name()); theinfo << endm; - WarningMsg << " is incomplete" << endm; + WarningMsg() << " is incomplete" << endm; if(mylogflag) - {WarningMsg << "WOKMake_BuildProcessIterator::MakeStep" + {WarningMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Consult " << logfile->Path()->Name()->ToCString() << " for details" << endm;} return WOKMake_Incomplete; case WOKMake_Failed: if(myprocessed.Contains(step->Unit()->Name())) myprocessed.Remove(step->Unit()->Name()); theinfo << endm; - ErrorMsg << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " failed" << endm; + ErrorMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " failed" << endm; if(mylogflag) - {ErrorMsg << "WOKMake_BuildProcessIterator::MakeStep" + {ErrorMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Consult " << logfile->Path()->Name()->ToCString() << " for details" << endm;} return WOKMake_Failed; case WOKMake_Unprocessed: theinfo << endm; - WarningMsg << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " is still unprocessed" << endm; + WarningMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " is still unprocessed" << endm; if(mylogflag) - {WarningMsg << "WOKMake_BuildProcessIterator::MakeStep" + {WarningMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Consult " << logfile->Path()->Name()->ToCString() << " for details" << endm;} break; } @@ -298,24 +298,24 @@ WOKMake_Status WOKMake_BuildProcessIterator::MakeStep() switch(step->Status()) { case WOKMake_Uptodate: - InfoMsg << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " is up to date" << endm; + InfoMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " is up to date" << endm; break; case WOKMake_Success: if(!myprocessed.Contains(step->Unit()->Name())) myprocessed.Add(step->Unit()->Name()); - InfoMsg << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " is successfull" << endm; + InfoMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " is successfull" << endm; break; case WOKMake_Processed: if(!myprocessed.Contains(step->Unit()->Name())) myprocessed.Add(step->Unit()->Name()); - //InfoMsg << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " is processed" << endm; + //InfoMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " is processed" << endm; break; case WOKMake_Incomplete: if(myprocessed.Contains(step->Unit()->Name())) myprocessed.Remove(step->Unit()->Name()); - WarningMsg << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " is incomplete" << endm; + WarningMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " is incomplete" << endm; return WOKMake_Incomplete; case WOKMake_Failed: if(myprocessed.Contains(step->Unit()->Name())) myprocessed.Remove(step->Unit()->Name()); - ErrorMsg << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " failed" << endm; + ErrorMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Step " << step->Code() << " failed" << endm; return WOKMake_Failed; case WOKMake_Unprocessed: @@ -391,7 +391,7 @@ WOKMake_Status WOKMake_BuildProcessIterator::Terminate() WOKMake_DataMapIteratorOfDataMapOfHAsciiStringOfSequenceOfHAsciiString anit(myprocess->Units()); - InfoMsg << "WOKMake_BuildProcessIterator::Terminate" + InfoMsg() << "WOKMake_BuildProcessIterator::Terminate" << "------------------ Process report ------------------" << endm; while(anit.More()) @@ -445,12 +445,12 @@ WOKMake_Status WOKMake_BuildProcessIterator::Terminate() switch(update) { case 0: - //InfoMsg << "WOKMake_BuildProcessIterator::Terminate" + //InfoMsg() << "WOKMake_BuildProcessIterator::Terminate" // << "Not done " << anit.Key() << endm; break; case 1: { - InfoMsg << "WOKMake_BuildProcessIterator::Terminate" + InfoMsg() << "WOKMake_BuildProcessIterator::Terminate" << "Success " << anit.Key() << endm; for(Standard_Integer i=1; i<=steps.Length(); i++) { const Handle(WOKMake_Step)& step = myprocess->Find(steps.Value(i)); @@ -495,7 +495,7 @@ WOKMake_Status WOKMake_BuildProcessIterator::Terminate() } } else { - ErrorMsg << "WOKMake_BuildProcessIterator::Terminate" + ErrorMsg() << "WOKMake_BuildProcessIterator::Terminate" << "Could not obtain step " << steps.Value(i) << endm; return WOKMake_Failed; } @@ -506,7 +506,7 @@ WOKMake_Status WOKMake_BuildProcessIterator::Terminate() case 2: { result = WOKMake_Failed; - InfoMsg << "WOKMake_BuildProcessIterator::Terminate" + InfoMsg() << "WOKMake_BuildProcessIterator::Terminate" << "Failed " << anit.Key() << " (" << failedlist << ")"<< endm; } } @@ -520,7 +520,7 @@ WOKMake_Status WOKMake_BuildProcessIterator::Terminate() myprocess->ClearUnits(); - InfoMsg << "WOKMake_BuildProcessIterator::Terminate" + InfoMsg() << "WOKMake_BuildProcessIterator::Terminate" << "----------------------------------------------------" << endm; WOKUtils_ProcessManager::KillAll(); @@ -577,7 +577,7 @@ void WOKMake_BuildProcessIterator::ReorderCurrentGroup() Handle(WOKernel_File) impldepfile = astep->Unit()->ImplDepFile(theloc,astep->Unit()->Name()); if (impldepfile.IsNull()) { - ErrorMsg << "WOKMake_BuildProcessIterator::ReorderCurrentGroup" << + ErrorMsg() << "WOKMake_BuildProcessIterator::ReorderCurrentGroup" << "Unable to get ImplDep file for unit " << astep->Unit()->Name()->ToCString() << endm; } else { @@ -597,7 +597,7 @@ void WOKMake_BuildProcessIterator::ReorderCurrentGroup() pkgstype, PACKAGESname); if (filepack.IsNull()) { - ErrorMsg << "WOKMake_BuildProcessIterator::ReorderCurrentGroup" << + ErrorMsg() << "WOKMake_BuildProcessIterator::ReorderCurrentGroup" << "Unable to get PACKAGES file for unit " << astep->Unit()->Name()->ToCString() << endm; } else { @@ -625,14 +625,14 @@ void WOKMake_BuildProcessIterator::ReorderCurrentGroup() Handle(TColStd_HSequenceOfHAsciiString) orderedtks = new TColStd_HSequenceOfHAsciiString ; while(algo.More()) { if(algo.NbVertices() > 1) { - ErrorMsg << "WOKMake_BuildProcessIterator::ReorderCurrentGroup" + ErrorMsg() << "WOKMake_BuildProcessIterator::ReorderCurrentGroup" << "Cyclic dependency detected between: "; for(i=1; i<= algo.NbVertices(); i++) { - ErrorMsg << algo.Value(i) << " "; + ErrorMsg() << algo.Value(i) << " "; } - ErrorMsg << endm; + ErrorMsg() << endm; IsCyclic = Standard_True; } diff --git a/src/WOKMake/WOKMake_DepItem.cxx b/src/WOKMake/WOKMake_DepItem.cxx index 643e5d1..bafd7ab 100755 --- a/src/WOKMake/WOKMake_DepItem.cxx +++ b/src/WOKMake/WOKMake_DepItem.cxx @@ -113,7 +113,7 @@ void WOKMake_DepItem::ReadLine(Standard_IStream& astream, Handle(WOKMake_DepItem } else { - ErrorMsg << "WOKMake_DepItem::ReadLine" + ErrorMsg() << "WOKMake_DepItem::ReadLine" << "Could not read invalid first line" << endm; anitem.Nullify(); return; @@ -218,7 +218,7 @@ Standard_Integer WOKMake_DepItem::WriteFile(const Handle(WOKUtils_Path)& apath, if(!astream) { - ErrorMsg << "WOKMake_DepItem::WriteFile" << "Could not open " << apath->Name() << endm; + ErrorMsg() << "WOKMake_DepItem::WriteFile" << "Could not open " << apath->Name() << endm; Standard_ProgramError::Raise(""); } diff --git a/src/WOKMake/WOKMake_InputFile.cxx b/src/WOKMake/WOKMake_InputFile.cxx index 15d37f5..567c784 100755 --- a/src/WOKMake/WOKMake_InputFile.cxx +++ b/src/WOKMake/WOKMake_InputFile.cxx @@ -228,7 +228,7 @@ Standard_Integer WOKMake_InputFile::WriteFile(const Handle(WOKUtils_Path)& apath if(!astream) { - ErrorMsg << "WOKMake_StepInput::Dump" << "Could not open " << apath->Name() << endm; + ErrorMsg() << "WOKMake_StepInput::Dump" << "Could not open " << apath->Name() << endm; Standard_ProgramError::Raise(""); } @@ -292,7 +292,7 @@ Standard_Integer WOKMake_InputFile::WriteFile(const Handle(WOKUtils_Path)& apath if(!astream) { - ErrorMsg << "WOKMake_StepInput::Dump" << "Could not open " << apath->Name() << endm; + ErrorMsg() << "WOKMake_StepInput::Dump" << "Could not open " << apath->Name() << endm; Standard_ProgramError::Raise(""); } diff --git a/src/WOKMake/WOKMake_MetaStep.cxx b/src/WOKMake/WOKMake_MetaStep.cxx index c8f9ce0..68c715c 100755 --- a/src/WOKMake/WOKMake_MetaStep.cxx +++ b/src/WOKMake/WOKMake_MetaStep.cxx @@ -129,7 +129,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKMake_MetaStep::GetUnderlyingSteps() if(thestep.IsNull()) { - ErrorMsg << "WOKMake_MetaStep::GetUnderlyingSteps" + ErrorMsg() << "WOKMake_MetaStep::GetUnderlyingSteps" << "Could not obtain step for code : " << Code() << " in unit " << Unit()->Name() << endm; SetFailed(); return NULLRESULT; @@ -150,7 +150,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKMake_MetaStep::GetUnderlyingSteps() if(precunit.IsNull()) { - ErrorMsg << "WOKMake_MetaStep::Execute" + ErrorMsg() << "WOKMake_MetaStep::Execute" << "Specified unit (" << aunit << ") in input of step " << Code() << " of " << Unit()->Name() << " could not be found" << endm; SetFailed(); @@ -170,7 +170,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKMake_MetaStep::GetUnderlyingSteps() if(precstep.IsNull()) { - ErrorMsg << "WOKMake_MetaStep::GetUnderlyingSteps" + ErrorMsg() << "WOKMake_MetaStep::GetUnderlyingSteps" << "Could not obtain step for code : " << acode << " in unit " << precunit->Name() << endm; SetFailed(); return NULLRESULT; @@ -372,7 +372,7 @@ void WOKMake_MetaStep::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execl if (thestep->IsToExecute()) { - InfoMsg << "WOKMake_MetaStep::Execute" + InfoMsg() << "WOKMake_MetaStep::Execute" << "========> " << thestep->SubCode() << endm; } @@ -383,24 +383,24 @@ void WOKMake_MetaStep::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execl switch(thestep->Status()) { case WOKMake_Uptodate: - InfoMsg << "WOKMake_MetaStep::Execute" + InfoMsg() << "WOKMake_MetaStep::Execute" << "========> " << thestep->SubCode() << " is uptodate" << endm; break; case WOKMake_Success: - InfoMsg << "WOKMake_MetaStep::Execute" + InfoMsg() << "WOKMake_MetaStep::Execute" << "========> " << thestep->SubCode() << " succeeded" << endm; break; case WOKMake_Incomplete: - WarningMsg << "WOKMake_MetaStep::Execute" + WarningMsg() << "WOKMake_MetaStep::Execute" << "========> " << thestep->SubCode() << " is incomplete" << endm; break; case WOKMake_Failed: - ErrorMsg << "WOKMake_MetaStep::Execute" + ErrorMsg() << "WOKMake_MetaStep::Execute" << "========> " << thestep->SubCode() << " failed" << endm; ok = Standard_False; break; case WOKMake_Unprocessed: - WarningMsg << "WOKMake_MetaStep::Execute" + WarningMsg() << "WOKMake_MetaStep::Execute" << "========> " << thestep->SubCode() << " is still unprocessed" << endm; ok=Standard_False; break; @@ -425,7 +425,7 @@ void WOKMake_MetaStep::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execl if(infile.IsNull()) { - WarningMsg << "WOKMake_MetaStep::Execute" + WarningMsg() << "WOKMake_MetaStep::Execute" << "Ignoring precedence step dependence on " << precid << " (not in input list)" << endm; } else diff --git a/src/WOKMake/WOKMake_OutputFile.cxx b/src/WOKMake/WOKMake_OutputFile.cxx index 176a90f..1788c22 100755 --- a/src/WOKMake/WOKMake_OutputFile.cxx +++ b/src/WOKMake/WOKMake_OutputFile.cxx @@ -238,7 +238,7 @@ Standard_Integer WOKMake_OutputFile::WriteFile(const Handle(WOKUtils_Path)& apat if(!astream) { - ErrorMsg << "WOKMake_StepOutput::Dump" << "Could not open " << apath->Name() << endm; + ErrorMsg() << "WOKMake_StepOutput::Dump" << "Could not open " << apath->Name() << endm; Standard_ProgramError::Raise(""); } @@ -299,7 +299,7 @@ Standard_Integer WOKMake_OutputFile::WriteFile(const Handle(WOKUtils_Path)& apat if(!astream) { - ErrorMsg << "WOKMake_StepOutput::Dump" << "Could not open " << apath->Name() << endm; + ErrorMsg() << "WOKMake_StepOutput::Dump" << "Could not open " << apath->Name() << endm; Standard_ProgramError::Raise(""); } diff --git a/src/WOKMake/WOKMake_Step.cxx b/src/WOKMake/WOKMake_Step.cxx index 9ce4284..07eb70c 100755 --- a/src/WOKMake/WOKMake_Step.cxx +++ b/src/WOKMake/WOKMake_Step.cxx @@ -154,15 +154,15 @@ void WOKMake_Step::GetInputFromStep(const Handle(WOKMake_Step)& astep) Handle(WOKMake_HSequenceOfOutputFile) out = astep->OutputFileList(); WOK_TRACE { - VerboseMsg("WOK_MAKE") << "WOKMake_Step::GetInputFromStep" + VerboseMsg()("WOK_MAKE") << "WOKMake_Step::GetInputFromStep" << "Compute Input Flow from step: " << astep->Unit()->Name() << ":" << astep->Code() << endm; } if(out.IsNull()) { - ErrorMsg << "WOKMake_Step::GetInputFromStep" + ErrorMsg() << "WOKMake_Step::GetInputFromStep" << "Output file list of step (" << astep->Code() << ") is not available" << endm; - ErrorMsg << "WOKMake_Step::GetInputFromStep" + ErrorMsg() << "WOKMake_Step::GetInputFromStep" << "Please perform this step before using step : " << Code() << endm; SetFailed(); return; @@ -189,7 +189,7 @@ void WOKMake_Step::GetInputFromStep(const Handle(WOKMake_Step)& astep) if(aunit.IsNull()) { - WarningMsg << "WOKMake_Step::GetInputFromStep" + WarningMsg() << "WOKMake_Step::GetInputFromStep" << "Skipping msentity " << name << " : unit " << outfile->ID()->Token(":", 1) << " not found" << endm; } @@ -210,7 +210,7 @@ void WOKMake_Step::GetInputFromStep(const Handle(WOKMake_Step)& astep) } else { - WarningMsg << "WOKMake_Step::GetInputFromStep" + WarningMsg() << "WOKMake_Step::GetInputFromStep" << "Skipping file " << outfile->LastPath()->Name() << " : not found" << endm; } } @@ -270,7 +270,7 @@ void WOKMake_Step::GetInputFlow() Handle(TColStd_HSequenceOfHAsciiString) steps = PrecedenceSteps(); WOK_TRACE { - VerboseMsg("WOK_MAKE") << "WOKMake_Step::GetInputFlow" + VerboseMsg()("WOK_MAKE") << "WOKMake_Step::GetInputFlow" << "Computing Input Flow" << endm; } @@ -356,9 +356,9 @@ void WOKMake_Step::LoadDependencies() if(!mydepin.Contains(anitem->IssuedFrom())) { - ErrorMsg << "WOKMake_Step::LoadDependencies" + ErrorMsg() << "WOKMake_Step::LoadDependencies" << "Unknown origin : " << anitem->IssuedFrom() << endm; - ErrorMsg << "WOKMake_Step::LoadDependencies" + ErrorMsg() << "WOKMake_Step::LoadDependencies" << "Dependences could not be loaded : will force step" << endm; mydepmatrix.Nullify(); mydepitems.Clear(); @@ -372,9 +372,9 @@ void WOKMake_Step::LoadDependencies() if(!mydepout.Contains(anitem->OutputFile())) { - ErrorMsg << "WOKMake_Step::LoadDependencies" + ErrorMsg() << "WOKMake_Step::LoadDependencies" << "Unknown output : " << anitem->OutputFile() << endm; - ErrorMsg << "WOKMake_Step::LoadDependencies" + ErrorMsg() << "WOKMake_Step::LoadDependencies" << "Dependences could not be loaded : will force step" << endm; mydepmatrix.Nullify(); mydepitems.Clear(); @@ -389,7 +389,7 @@ void WOKMake_Step::LoadDependencies() if(mydepmatrix->Value(out_index, in_index)) { - WarningMsg << "WOKMake_Step::LoadDependencies" + WarningMsg() << "WOKMake_Step::LoadDependencies" << "Ignoring duplicate line in depfile (" << anitem->OutputFile() << " : " << anitem->IssuedFrom() << ")" << endm; } else @@ -491,7 +491,7 @@ Handle(WOKMake_HSequenceOfInputFile) WOKMake_Step::OutOfDateEntities() case WOKMake_Disappeared: if(myinflow.Contains(infile->ID())) { - ErrorMsg << "WOKMake_Step::OutOfDateEntities" + ErrorMsg() << "WOKMake_Step::OutOfDateEntities" << "Could not locate input file : " << infile->ID() << endm; SetFailed(); return result; @@ -813,7 +813,7 @@ Standard_Boolean WOKMake_Step::CheckStatus(const Standard_CString amsg) const case WOKMake_Processed: break; case WOKMake_Failed: - ErrorMsg << "WOKMake_Step::Make" << "Failed during " << amsg << endm; + ErrorMsg() << "WOKMake_Step::Make" << "Failed during " << amsg << endm; return Standard_True; } return Standard_False; @@ -884,7 +884,7 @@ void WOKMake_Step::AcquitExecution(const Handle(WOKMake_HSequenceOfInputFile)& e if(afile.IsNull()) { - WarningMsg << "WOKMake_Step::AcquitExecution" + WarningMsg() << "WOKMake_Step::AcquitExecution" << "Could not find precedence step (" << precstep->UniqueName() << ") admin file : " << precstep->OutputFilesFileName() << endm; } @@ -1350,7 +1350,7 @@ WOKMake_Status WOKMake_Step::Make() !strcmp ( aType, "WOKStep_LibLink" ) ) { - InfoMsg << "WOKMake_Step :: Make" << "Generating build file" << endm; + InfoMsg() << "WOKMake_Step :: Make" << "Generating build file" << endm; g_fCompOrLnk = Standard_True; @@ -1504,7 +1504,7 @@ Standard_Boolean WOKMake_Step::HandleOutputFile(const Handle(WOKMake_OutputFile) if(atempl.IsNull()) { - WarningMsg << "WOKMake_Step::HandleOutputFile" + WarningMsg() << "WOKMake_Step::HandleOutputFile" << "Could not determine Del action for type : " << afile->File()->TypeName() << endm; ashell->UnLock(); return Standard_False; @@ -1512,7 +1512,7 @@ Standard_Boolean WOKMake_Step::HandleOutputFile(const Handle(WOKMake_OutputFile) if(! Unit()->Params().IsSet(atempl->ToCString())) { - ErrorMsg << "WOKMake_Step::HandleOutputFile" + ErrorMsg() << "WOKMake_Step::HandleOutputFile" << "Could not eval Del action (" << atempl << ") for type : " << afile->File()->TypeName() << endm; ashell->UnLock(); return Standard_False; @@ -1528,7 +1528,7 @@ Standard_Boolean WOKMake_Step::HandleOutputFile(const Handle(WOKMake_OutputFile) if(!acmd.IsNull()) { - InfoMsg << "WOKMake_Step::HandleOutputFile" + InfoMsg() << "WOKMake_Step::HandleOutputFile" << "Invoking " << atempl << " on " << afile->File()->Path()->Name() << endm; ashell->Execute(acmd); @@ -1536,15 +1536,15 @@ Standard_Boolean WOKMake_Step::HandleOutputFile(const Handle(WOKMake_OutputFile) if(ashell->Status()) { Handle(TColStd_HSequenceOfHAsciiString) resseq = ashell->Errors(); - Standard_Boolean ph = ErrorMsg.PrintHeader(); + Standard_Boolean ph = ErrorMsg().PrintHeader(); - ErrorMsg << "WOKMake_Step::HandleOutputFile" << "Errors occured in Shell" << endm; - ErrorMsg.DontPrintHeader(); + ErrorMsg() << "WOKMake_Step::HandleOutputFile" << "Errors occured in Shell" << endm; + ErrorMsg().DontPrintHeader(); for(Standard_Integer i=1; i<= resseq->Length(); i++) { - ErrorMsg << "WOKMake_Step::HandleOutputFile" << resseq->Value(i) << endm; + ErrorMsg() << "WOKMake_Step::HandleOutputFile" << resseq->Value(i) << endm; } - if(ph) ErrorMsg.DoPrintHeader(); + if(ph) ErrorMsg().DoPrintHeader(); } OutLocator()->ChangeRemove(afile->File()); ashell->ClearOutput(); @@ -1555,7 +1555,7 @@ Standard_Boolean WOKMake_Step::HandleOutputFile(const Handle(WOKMake_OutputFile) { if(afile->File()->Path()->IsSymLink()) { - WarningMsg << "WOKMake_Step::HandleOutputFile" + WarningMsg() << "WOKMake_Step::HandleOutputFile" << "Disappeared File (" << afile->File()->UserPathName() << ") does not exists " << endm; } } @@ -1564,7 +1564,7 @@ Standard_Boolean WOKMake_Step::HandleOutputFile(const Handle(WOKMake_OutputFile) } else { - WarningMsg << "WOKMake_Step::HandleOutputFile" + WarningMsg() << "WOKMake_Step::HandleOutputFile" << "File " << afile->File()->UserPathName() << " is not in " << Unit()->UserPathName() << " : Disappeared and left untouched" << endm; return Standard_False; diff --git a/src/WOKMake/WOKMake_StepBuilder.cxx b/src/WOKMake/WOKMake_StepBuilder.cxx index 830d6ab..45348bb 100755 --- a/src/WOKMake/WOKMake_StepBuilder.cxx +++ b/src/WOKMake/WOKMake_StepBuilder.cxx @@ -78,7 +78,7 @@ WOKMake_DataMapOfHAsciiStringOfStepBuilder& WOKMake_StepBuilder::StepBuilders() void WOKMake_StepBuilder::Add() const { WOK_TRACE { - VerboseMsg("WOK_STEP") << "WOKMake_StepBuilder::Add" + VerboseMsg()("WOK_STEP") << "WOKMake_StepBuilder::Add" << "Adding " << myname << " in cache" << endm; } WOKMake_StepBuilder::StepBuilders().Bind(Name(), *this); @@ -105,7 +105,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(name.IsNull() || aunit.IsNull() || acode.IsNull()) { - ErrorMsg << "WOKMake_StepBuilder::BuildStep" + ErrorMsg() << "WOKMake_StepBuilder::BuildStep" << "Invalid Input to WOKMake_StepBuilder::BuildStep" << endm; Standard_ProgramError::Raise("Invalid Input to WOKMake_StepBuilder::BuildStep"); } @@ -114,7 +114,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(libs.IsNull()) { - ErrorMsg << "WOKMake_Step::GetStep" + ErrorMsg() << "WOKMake_Step::GetStep" << "Could not eval parameter %WOKSteps_StepLibs" << endm; return result; } @@ -122,7 +122,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(knownsteps.IsBound(name)) { WOK_TRACE { - VerboseMsg("WOK_STEP") << "WOKMake_StepBuilder::BuildStep" + VerboseMsg()("WOK_STEP") << "WOKMake_StepBuilder::BuildStep" << "Got " << name << " in cache at pos " << i << endm; } return (*knownsteps.Find(name).Builder())(aprocess,aunit,acode,checked,hidden); @@ -160,7 +160,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(libpath.IsNull()) { - ErrorMsg << "WOKMake_Step::GetStep" + ErrorMsg() << "WOKMake_Step::GetStep" << "Could not eval parameter " << libparam.ToCString() << endm; return result; } @@ -173,7 +173,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(alibpath.IsNull()) { - ErrorMsg << "WOKMake_Step::GetStep" + ErrorMsg() << "WOKMake_Step::GetStep" << "Could not eval find library " << libpath << endm; return result; } @@ -184,7 +184,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(!ashlib.DlOpen(OSD_RTLD_LAZY)) { - ErrorMsg << "WOKMake_Step::GetStep" + ErrorMsg() << "WOKMake_Step::GetStep" << "Could not open " << libpath << " : " << ashlib.DlError() << endm; return result; } @@ -193,7 +193,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(ptr == NULL) { - ErrorMsg << "WOKMake_Step::GetStep" + ErrorMsg() << "WOKMake_Step::GetStep" << "Could not find " << key << " in " << libpath << endm; return result; } @@ -201,7 +201,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr WOKMake_StepBuilder builder(name, ptr); WOK_TRACE { - VerboseMsg("WOK_STEP") << "WOKMake_Step::GetStep" + VerboseMsg()("WOK_STEP") << "WOKMake_Step::GetStep" << "Adding main : " << name->ToCString() << endm; } @@ -223,7 +223,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(ptr == NULL) { - WarningMsg << "WOKMake_Step::GetStep" + WarningMsg() << "WOKMake_Step::GetStep" << "Could not find declared " << otherkey << " in " << libpath << endm; } else @@ -231,7 +231,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr WOKMake_StepBuilder builder(astr, ptr); WOK_TRACE { - VerboseMsg("WOK_STEP") << "WOKMake_Step::GetStep" + VerboseMsg()("WOK_STEP") << "WOKMake_Step::GetStep" << "Adding : " << astr->ToCString() << endm; } builder.Add(); @@ -251,7 +251,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(result.IsNull()) { WOK_TRACE { - VerboseMsg("WOK_STEP") << "WOKMake_Step::GetStep" + VerboseMsg()("WOK_STEP") << "WOKMake_Step::GetStep" << key << " is a triggerred step" << endm; } @@ -277,13 +277,13 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(aunit.IsNull()) { - ErrorMsg << "WOKMake_StepBuilder::BuildStep" + ErrorMsg() << "WOKMake_StepBuilder::BuildStep" << "Invalid Null Unit" << endm; return result; } if(acode.IsNull()) { - ErrorMsg << "WOKMake_StepBuilder::BuildStep" + ErrorMsg() << "WOKMake_StepBuilder::BuildStep" << "Invalid Null Step code" << endm; return result; } @@ -333,7 +333,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr begin++; break; default: - ErrorMsg << "WOKMake_StepDescrExplorer" << "Bad WOKMake Step ctl Character in : " << key << endm; + ErrorMsg() << "WOKMake_StepDescrExplorer" << "Bad WOKMake Step ctl Character in : " << key << endm; Standard_ProgramError::Raise("WOKMake_StepDescrExplorer"); } } @@ -355,7 +355,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr if(precend == 0) { - ErrorMsg << "WOKMake_StepBuilder::GetStep" << "Bad WOKMake Step format : " << key << endm; + ErrorMsg() << "WOKMake_StepBuilder::GetStep" << "Bad WOKMake Step format : " << key << endm; Standard_ProgramError::Raise("WOKMake_StepBuilder::GetStep"); } diff --git a/src/WOKMake/WOKMake_TriggerStep.cxx b/src/WOKMake/WOKMake_TriggerStep.cxx index 67070fb..4ce0820 100755 --- a/src/WOKMake/WOKMake_TriggerStep.cxx +++ b/src/WOKMake/WOKMake_TriggerStep.cxx @@ -190,9 +190,9 @@ void WOKMake_TriggerStep::Init() if(apath.IsNull()) { - WarningMsg << "WOKMake_TriggerStep::Init" + WarningMsg() << "WOKMake_TriggerStep::Init" << "Could not find file associated with trigger step " << Name() << endm; - WarningMsg << "WOKMake_TriggerStep::Init" + WarningMsg() << "WOKMake_TriggerStep::Init" << "Nothing done" << endm; }