From 9983b08ff287fb77c360672fff62df97b76fed5a Mon Sep 17 00:00:00 2001 From: cascade Date: Fri, 13 Feb 2009 18:33:58 +0000 Subject: [PATCH] OCC20850 umake command do not work on SunOS10 --- src/WOKOBJS/WOKOBJS_EngLinkList.cxx | 2 +- src/WOKOBJS/WOKOBJS_OSSG.cxx | 22 +++++++++++----------- src/WOKOBJS/WOKOBJS_SchGen.cxx | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/WOKOBJS/WOKOBJS_EngLinkList.cxx b/src/WOKOBJS/WOKOBJS_EngLinkList.cxx index 2256265..1573430 100755 --- a/src/WOKOBJS/WOKOBJS_EngLinkList.cxx +++ b/src/WOKOBJS/WOKOBJS_EngLinkList.cxx @@ -50,7 +50,7 @@ void WOKOBJS_EngLinkList::ComputeSchema(const Handle(WOKernel_DevUnit)& aunit, if(libfile.IsNull()) { - ErrorMsg << "WOKStep_EngLinkList::Execute" + ErrorMsg() << "WOKStep_EngLinkList::Execute" << "Could not locate library file for schema : " << aunit->Name() << endm; } else diff --git a/src/WOKOBJS/WOKOBJS_OSSG.cxx b/src/WOKOBJS/WOKOBJS_OSSG.cxx index 095f59a..9783612 100755 --- a/src/WOKOBJS/WOKOBJS_OSSG.cxx +++ b/src/WOKOBJS/WOKOBJS_OSSG.cxx @@ -155,8 +155,8 @@ WOKBuilder_BuildStatus WOKOBJS_OSSG::Execute() astr = Params().Eval("OBJS_OSSG_CmdLine", Standard_True); WOK_TRACE { - VerboseMsg("WOK_OBJS") << "WOKOBJS_OSSG::Execute" << "OSSG line : " << endm; - VerboseMsg("WOK_OBJS") << "WOKOBJS_OSSG::Execute" << astr << endm; + VerboseMsg()("WOK_OBJS") << "WOKOBJS_OSSG::Execute" << "OSSG line : " << endm; + VerboseMsg()("WOK_OBJS") << "WOKOBJS_OSSG::Execute" << astr << endm; } Shell()->Execute(astr); @@ -166,26 +166,26 @@ WOKBuilder_BuildStatus WOKOBJS_OSSG::Execute() if(Shell()->Status()) { - Standard_Boolean ph = ErrorMsg.PrintHeader(); + Standard_Boolean ph = ErrorMsg().PrintHeader(); - ErrorMsg << "WOKOBJS_OSSG::Execute" << "Errors occured in Shell" << endm; - ErrorMsg.DontPrintHeader(); + ErrorMsg() << "WOKOBJS_OSSG::Execute" << "Errors occured in Shell" << endm; + ErrorMsg().DontPrintHeader(); for(Standard_Integer i=1; i<= resseq->Length(); i++) { - ErrorMsg << "WOKOBJS_OSSG::Execute" << resseq->Value(i) << endm; + ErrorMsg() << "WOKOBJS_OSSG::Execute" << resseq->Value(i) << endm; } - if(ph) ErrorMsg.DoPrintHeader(); + if(ph) ErrorMsg().DoPrintHeader(); return WOKBuilder_Failed; } else { - Standard_Boolean ph = InfoMsg.PrintHeader(); - InfoMsg.DontPrintHeader(); + Standard_Boolean ph = InfoMsg().PrintHeader(); + InfoMsg().DontPrintHeader(); for(Standard_Integer i=1; i<= resseq->Length(); i++) { - InfoMsg << "WOKOBJS_OSSG::Execute" << resseq->Value(i) << endm; + InfoMsg() << "WOKOBJS_OSSG::Execute" << resseq->Value(i) << endm; } - if(ph) InfoMsg.DoPrintHeader(); + if(ph) InfoMsg().DoPrintHeader(); } Shell()->ClearOutput(); diff --git a/src/WOKOBJS/WOKOBJS_SchGen.cxx b/src/WOKOBJS/WOKOBJS_SchGen.cxx index 7b9cc0e..1eeddf0 100755 --- a/src/WOKOBJS/WOKOBJS_SchGen.cxx +++ b/src/WOKOBJS/WOKOBJS_SchGen.cxx @@ -181,7 +181,7 @@ void WOKOBJS_SchGen::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execlis // Verification du profile DB if( Unit()->Session()->DBMSystem() != WOKernel_OBJS ) { - ErrorMsg << "WOKOBJS_SchGen::Execute" + ErrorMsg() << "WOKOBJS_SchGen::Execute" << "Wrong profile for this step : Only OBJS is valid" << endm; SetFailed(); return; @@ -217,7 +217,7 @@ void WOKOBJS_SchGen::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execlis ossg->SetSchFile(new WOKBuilder_Compilable(infile->File()->Path())); - InfoMsg << "WOKOBJS_DDLFile" + InfoMsg() << "WOKOBJS_DDLFile" << "Extracting " << Unit()->Name() << endm; switch(ossg->Execute()) @@ -225,14 +225,14 @@ void WOKOBJS_SchGen::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execlis case WOKBuilder_Success: { WOK_TRACE { - if(VerboseMsg("WOK_OBJS").IsSet()) + if(VerboseMsg()("WOK_OBJS").IsSet()) { Standard_Integer i; - VerboseMsg << "WOKOBJS_SchGen::Execute" + VerboseMsg() << "WOKOBJS_SchGen::Execute" << infile->File()->Name() << " produces : " << endm; for(i=1; i<=ossg->Produces()->Length(); i++) { - VerboseMsg << "WOKOBJS_SchGen::Execute" + VerboseMsg() << "WOKOBJS_SchGen::Execute" << "\t\t" << ossg->Produces()->Value(i)->Path()->Name() << endm; } } @@ -255,7 +255,7 @@ void WOKOBJS_SchGen::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execlis outfile = new WOKernel_File(anent->Path()->FileName(), Unit(), libraryfile); break; default: - ErrorMsg << "WOKOBJS_SchGen::Execute" + ErrorMsg() << "WOKOBJS_SchGen::Execute" << "Unrecognized output file : " << anent->Path()->FileName() << endm; break; } @@ -294,12 +294,12 @@ void WOKOBJS_SchGen::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execlis out->SetProduction(); AddExecDepItem(execlist->Value(i), out, Standard_True); - InfoMsg << "WOKOBJS_SchGen::Execute" << "File : " << outfile->Path()->Name() << " is modified" << endm; + InfoMsg() << "WOKOBJS_SchGen::Execute" << "File : " << outfile->Path()->Name() << " is modified" << endm; } break; case WOKBuilder_Unbuilt: WOK_TRACE { - VerboseMsg("WOK_OBJS") << "WOKMake_Extract::Execute" + VerboseMsg()("WOK_OBJS") << "WOKMake_Extract::Execute" << "File : " << outfile->Path()->Name() << " is unchanged" << endm; } { @@ -312,14 +312,14 @@ void WOKOBJS_SchGen::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execlis break; case WOKBuilder_Failed: SetFailed(); - ErrorMsg << "WOKOBJS_SchGen::Execute" << "Failed : " << outfile->Name() << endm; + ErrorMsg() << "WOKOBJS_SchGen::Execute" << "Failed : " << outfile->Name() << endm; break; } } } break; case WOKBuilder_Failed: - ErrorMsg << "WOKOBJS_SchGen::Execute" << "Failed : " << Unit()->Name() << endm; + ErrorMsg() << "WOKOBJS_SchGen::Execute" << "Failed : " << Unit()->Name() << endm; SetFailed(); break; default: break; -- 2.39.5