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=bd8a3a2ae2eb5d5a65bdae0ed215540a7f1897a0;p=occt-wok.git OCC20850 umake command do not work on SunOS10 --- diff --git a/src/WOKStep/WOKStep_ArchiveLibrary.cxx b/src/WOKStep/WOKStep_ArchiveLibrary.cxx index aaa8945..138c147 100755 --- a/src/WOKStep/WOKStep_ArchiveLibrary.cxx +++ b/src/WOKStep/WOKStep_ArchiveLibrary.cxx @@ -131,7 +131,7 @@ void WOKStep_ArchiveLibrary::Execute(const Handle(WOKMake_HSequenceOfInputFile)& } // calcul de la librairie - InfoMsg << "WOKStep_ArchiveLibrary::Execute" << "Creating : lib" << ar->TargetName() << ".a" << endm; + InfoMsg() << "WOKStep_ArchiveLibrary::Execute" << "Creating : lib" << ar->TargetName() << ".a" << endm; switch(ar->Execute()) { @@ -166,12 +166,12 @@ void WOKStep_ArchiveLibrary::Execute(const Handle(WOKMake_HSequenceOfInputFile)& } } } - InfoMsg << "WOKStep_ArchiveLibrary::Execute" + InfoMsg() << "WOKStep_ArchiveLibrary::Execute" << "Succeeded : lib" << ar->TargetName() << ".a" << endm; SetSucceeded(); break; case WOKBuilder_Failed: - ErrorMsg << "WOKStep_ArchiveLibrary" + ErrorMsg() << "WOKStep_ArchiveLibrary" << "Failed : lib" << ar->TargetName() << ".a" << endm; SetFailed(); break; diff --git a/src/WOKStep/WOKStep_CDLUnitSource.cxx b/src/WOKStep/WOKStep_CDLUnitSource.cxx index 73be607..13bdf04 100755 --- a/src/WOKStep/WOKStep_CDLUnitSource.cxx +++ b/src/WOKStep/WOKStep_CDLUnitSource.cxx @@ -140,7 +140,7 @@ _TEST_BREAK(); } else { - WarningMsg << "WOKStep_MSFill::Execute" << "No file " << astr << " in " << aunitname << endm; + WarningMsg() << "WOKStep_MSFill::Execute" << "No file " << astr << " in " << aunitname << endm; SetIncomplete(); } @@ -186,7 +186,7 @@ _TEST_BREAK(); } } if (stop) { - ErrorMsg << "WOKStep_MSFill::Execute" + ErrorMsg() << "WOKStep_MSFill::Execute" << "Unit and cdl file definition type mismatch for unit " << Unit()->Name() << endm; } } diff --git a/src/WOKStep/WOKStep_ClientExtract.cxx b/src/WOKStep/WOKStep_ClientExtract.cxx index dd9b1f1..f5af391 100755 --- a/src/WOKStep/WOKStep_ClientExtract.cxx +++ b/src/WOKStep/WOKStep_ClientExtract.cxx @@ -199,7 +199,7 @@ Handle(WOKMake_HSequenceOfInputFile) WOKStep_ClientExtract::OutOfDateEntities() if(anent.IsNull()) { - ErrorMsg << "WOKStep_ClientExtract::OutOfDateEntities" + ErrorMsg() << "WOKStep_ClientExtract::OutOfDateEntities" << infile->ID() << " is not a MS Entity" << endm; SetFailed(); return result; @@ -265,13 +265,13 @@ void WOKStep_ClientExtract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& case WOKBuilder_Success: { WOK_TRACE { - if(VerboseMsg("WOK_EXTRACT").IsSet()) + if(VerboseMsg()("WOK_EXTRACT").IsSet()) { - VerboseMsg << "WOKStep_Extract::Execute" + VerboseMsg() << "WOKStep_Extract::Execute" << entity->Name() << " produces : " << endm; for(i=1; i<=anit.Produces()->Length(); i++) { - VerboseMsg << "WOKStep_Extract::Execute" + VerboseMsg() << "WOKStep_Extract::Execute" << "\t\t" << anit.Produces()->Value(i)->Path()->Name() << endm; } } @@ -349,11 +349,11 @@ void WOKStep_ClientExtract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& out->SetProduction(); if(!istemplate) AddExecDepItem(tobuild->Value(j), out, Standard_True); - InfoMsg << "WOKStep_Extract::Execute" << "File : " << outfile->Path()->Name() << " is modified" << endm; + InfoMsg() << "WOKStep_Extract::Execute" << "File : " << outfile->Path()->Name() << " is modified" << endm; break; case WOKBuilder_Unbuilt: WOK_TRACE { - VerboseMsg("WOK_EXTRACT") << "WOKStep_Extract::Execute" + VerboseMsg()("WOK_EXTRACT") << "WOKStep_Extract::Execute" << "File : " << outfile->Path()->Name() << " is unchanged" << endm; } @@ -365,14 +365,14 @@ void WOKStep_ClientExtract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& break; case WOKBuilder_Failed: SetFailed(); - ErrorMsg << "WOKStep_Extract::Execute" << "Failed : " << outfile->Name() << endm; + ErrorMsg() << "WOKStep_Extract::Execute" << "Failed : " << outfile->Name() << endm; break; } } } break; case WOKBuilder_Failed: - ErrorMsg << "WOKStep_Extract::Execute" << "Failed : " << entity->Name() << endm; + ErrorMsg() << "WOKStep_Extract::Execute" << "Failed : " << entity->Name() << endm; break; default: break; } diff --git a/src/WOKStep/WOKStep_CodeGenerate.cxx b/src/WOKStep/WOKStep_CodeGenerate.cxx index d0523e2..2d59ab6 100755 --- a/src/WOKStep/WOKStep_CodeGenerate.cxx +++ b/src/WOKStep/WOKStep_CodeGenerate.cxx @@ -80,7 +80,7 @@ void WOKStep_CodeGenerate::Init() if(myiterator.LoadGroup()) { - ErrorMsg << "WOKStep_CodeGenerate::Init" + ErrorMsg() << "WOKStep_CodeGenerate::Init" << "Could not load code generators definition" << endm; SetFailed(); return; @@ -163,25 +163,25 @@ void WOKStep_CodeGenerate::Execute(const Handle(WOKMake_HSequenceOfInputFile)& e if(infile->File()->Nesting()->IsSameString(Unit()->FullName())) { - InfoMsg << "WOKStep_CodeGenerate::Execute" << "-------> " << infile->File()->Name() << endm; + InfoMsg() << "WOKStep_CodeGenerate::Execute" << "-------> " << infile->File()->Name() << endm; } else { - InfoMsg << "WOKStep_CodeGenerate::Execute" << "-------> " << infile->File()->UserPathName() << endm; + InfoMsg() << "WOKStep_CodeGenerate::Execute" << "-------> " << infile->File()->UserPathName() << endm; } switch(myiterator.Execute(codegen)) { case WOKBuilder_Success: WOK_TRACE { - if(VerboseMsg("WOK_CODEGEN").IsSet()) + if(VerboseMsg()("WOK_CODEGEN").IsSet()) { - VerboseMsg << "WOKStep_CodeGenerate::Execute" + VerboseMsg() << "WOKStep_CodeGenerate::Execute" << codegen->Path()->Name() << " produces : " << endm; for(i=1; i<=myiterator.Produces()->Length(); i++) { - VerboseMsg << "WOKStep_CodeGenerate::Execute" + VerboseMsg() << "WOKStep_CodeGenerate::Execute" << "\t\t" << myiterator.Produces()->Value(i)->Path()->Name() << endm; } } @@ -212,7 +212,7 @@ void WOKStep_CodeGenerate::Execute(const Handle(WOKMake_HSequenceOfInputFile)& e if(aoutfile.IsNull()) { - ErrorMsg << "WOKStep_CodeGenerate::Execute" + ErrorMsg() << "WOKStep_CodeGenerate::Execute" << "Unrecognized file : " << outent->Path()->Name() << endm; } else @@ -234,7 +234,7 @@ void WOKStep_CodeGenerate::Execute(const Handle(WOKMake_HSequenceOfInputFile)& e break; case WOKBuilder_Failed: fails->Append(infile); - ErrorMsg << "WOKStep_CodeGenerate::Execute" << "Failed : " << infile->File()->Name() << endm; + ErrorMsg() << "WOKStep_CodeGenerate::Execute" << "Failed : " << infile->File()->Name() << endm; break; default: break; } @@ -250,15 +250,15 @@ void WOKStep_CodeGenerate::Execute(const Handle(WOKMake_HSequenceOfInputFile)& e if(fails->Length()) { - InfoMsg << "WOKStep_CodeGenerate::Execute" + InfoMsg() << "WOKStep_CodeGenerate::Execute" << "----------------------- Compilation Report -----------------------" << endm; for(i=1; i<= fails->Length(); i++) { - InfoMsg << "WOKStep_CodeGenerate::Execute" + InfoMsg() << "WOKStep_CodeGenerate::Execute" << "Failed : " << fails->Value(i)->File()->UserPathName() << endm; } - InfoMsg << "WOKStep_CodeGenerate::Execute" + InfoMsg() << "WOKStep_CodeGenerate::Execute" << "-----------------------------------------------------------------" << endm; } diff --git a/src/WOKStep/WOKStep_Compile.cxx b/src/WOKStep/WOKStep_Compile.cxx index b2d7630..b0d0146 100755 --- a/src/WOKStep/WOKStep_Compile.cxx +++ b/src/WOKStep/WOKStep_Compile.cxx @@ -121,7 +121,7 @@ void WOKStep_Compile::Init() if(myiterator.LoadGroup()) { - ErrorMsg << "WOKStep_Compile::Init" + ErrorMsg() << "WOKStep_Compile::Init" << "Could not load compilers definition" << endm; SetFailed(); return; @@ -209,25 +209,25 @@ _TEST_BREAK(); //<--- EUG4YAN if(infile->File()->Nesting()->IsSameString(Unit()->FullName())) { - InfoMsg << "WOKStep_Compile::Execute" << "-------> " << infile->File()->Name() << endm; + InfoMsg() << "WOKStep_Compile::Execute" << "-------> " << infile->File()->Name() << endm; } else { - InfoMsg << "WOKStep_Compile::Execute" << "-------> " << infile->File()->UserPathName() << endm; + InfoMsg() << "WOKStep_Compile::Execute" << "-------> " << infile->File()->UserPathName() << endm; } switch(myiterator.Execute(compilable)) { case WOKBuilder_Success: WOK_TRACE { - if(VerboseMsg("WOK_COMPILE").IsSet()) + if(VerboseMsg()("WOK_COMPILE").IsSet()) { - VerboseMsg << "WOKStep_Compile::Execute" + VerboseMsg() << "WOKStep_Compile::Execute" << compilable->Path()->Name() << " produces : " << endm; if (!myiterator.Produces().IsNull()) { for(i=1; i<=myiterator.Produces()->Length(); i++) { - VerboseMsg << "WOKStep_Compile::Execute" + VerboseMsg() << "WOKStep_Compile::Execute" << "\t\t" << myiterator.Produces()->Value(i)->Path()->Name() << endm; } } @@ -289,7 +289,7 @@ _TEST_BREAK(); break; case WOKBuilder_Failed: fails->Append(infile); - ErrorMsg << "WOKStep_Compile::Execute" << "Failed : " << infile->File()->Name() << endm; + ErrorMsg() << "WOKStep_Compile::Execute" << "Failed : " << infile->File()->Name() << endm; break; default: break; } @@ -305,15 +305,15 @@ _TEST_BREAK(); if(fails->Length()) { - InfoMsg << "WOKStep_Compile::Execute" + InfoMsg() << "WOKStep_Compile::Execute" << "----------------------- Compilation Report -----------------------" << endm; for(i=1; i<= fails->Length(); i++) { - InfoMsg << "WOKStep_Compile::Execute" + InfoMsg() << "WOKStep_Compile::Execute" << "Failed : " << fails->Value(i)->File()->UserPathName() << endm; } - InfoMsg << "WOKStep_Compile::Execute" + InfoMsg() << "WOKStep_Compile::Execute" << "-----------------------------------------------------------------" << endm; } @@ -355,7 +355,7 @@ _TEST_BREAK(); p.SystemName ( s ); - ErrorMsg << "WOKStep_Compile :: Execute" + ErrorMsg() << "WOKStep_Compile :: Execute" << "could not create '" << new TCollection_HAsciiString ( s ) << "'" << endm; diff --git a/src/WOKStep/WOKStep_ComputeLinkList.cxx b/src/WOKStep/WOKStep_ComputeLinkList.cxx index 5aed064..74d2427 100755 --- a/src/WOKStep/WOKStep_ComputeLinkList.cxx +++ b/src/WOKStep/WOKStep_ComputeLinkList.cxx @@ -145,7 +145,7 @@ void WOKStep_ComputeLinkList::Execute(const Handle(WOKMake_HSequenceOfInputFile) if(PACKAGES.IsNull()) { - ErrorMsg << "WOKStep_ComputeLinkList::Execute" + ErrorMsg() << "WOKStep_ComputeLinkList::Execute" << "Could not find PACKAGES file for toolkit : " << Unit()->Name() << endm; SetFailed(); return; @@ -159,7 +159,7 @@ void WOKStep_ComputeLinkList::Execute(const Handle(WOKMake_HSequenceOfInputFile) if(udsoftk.IsNull()) { - ErrorMsg << "WOKStep_ComputeLinkList::Execute" + ErrorMsg() << "WOKStep_ComputeLinkList::Execute" << "Could not read file " << PACKAGES->Path()->Name() << endm; SetFailed(); return; @@ -173,7 +173,7 @@ void WOKStep_ComputeLinkList::Execute(const Handle(WOKMake_HSequenceOfInputFile) if(aunit.IsNull()) { - ErrorMsg << "WOKStep_ComputeLinkList::Execute" + ErrorMsg() << "WOKStep_ComputeLinkList::Execute" << "Unknown unit (" << udsoftk->Value(j) << ") listed in PACKAGES of : " << Unit()->Name() << endm; SetFailed(); return; @@ -238,7 +238,7 @@ void WOKStep_ComputeLinkList::Execute(const Handle(WOKMake_HSequenceOfInputFile) if(unit.IsNull()) { - ErrorMsg << "WOKStep_ComputeExecList::Execute" + ErrorMsg() << "WOKStep_ComputeExecList::Execute" << "Cannot find the uses library unit " << aunit << endm; SetFailed(); return; @@ -278,7 +278,7 @@ void WOKStep_ComputeLinkList::Execute(const Handle(WOKMake_HSequenceOfInputFile) thelist->Append(list->Value(j)); } else { - ErrorMsg << "WOKStep_ComputeExecList::Execute" + ErrorMsg() << "WOKStep_ComputeExecList::Execute" << "Cannot find the Input ImplDep file" << endm; SetFailed(); return; diff --git a/src/WOKStep/WOKStep_DLLink.cxx b/src/WOKStep/WOKStep_DLLink.cxx index b9779fe..d3f4a67 100755 --- a/src/WOKStep/WOKStep_DLLink.cxx +++ b/src/WOKStep/WOKStep_DLLink.cxx @@ -100,7 +100,7 @@ Handle(WOKBuilder_HSequenceOfLibrary) WOKStep_DLLink::ComputeLibraryList(const H if(alib.IsNull()) { - ErrorMsg << "WOKStep_Link::ComputeLibraryList" + ErrorMsg() << "WOKStep_Link::ComputeLibraryList" << "Could not find library in unit : " << aunit->UserPathName() << endm; SetFailed(); } @@ -146,7 +146,7 @@ Handle(WOKBuilder_Library)FASTCALL _get_unit_library( else { - WarningMsg << "_get_unit_library" + WarningMsg() << "_get_unit_library" << "Unknown nesting for " << unit->UserPathName() << endm; return retVal; diff --git a/src/WOKStep/WOKStep_DynamicLibrary.cxx b/src/WOKStep/WOKStep_DynamicLibrary.cxx index 09097de..86a00b0 100755 --- a/src/WOKStep/WOKStep_DynamicLibrary.cxx +++ b/src/WOKStep/WOKStep_DynamicLibrary.cxx @@ -150,7 +150,7 @@ void WOKStep_DynamicLibrary::Execute(const Handle(WOKMake_HSequenceOfInputFile)& if ( !lnkfile -> Path () -> CreateFile () ) - ErrorMsg << "WOKStep_Link::ExecuteLink" + ErrorMsg() << "WOKStep_Link::ExecuteLink" << "Unable to create link file '" << lnkfile -> Path () -> Name () -> ToCString () << "'" << endm; @@ -207,7 +207,7 @@ void WOKStep_DynamicLibrary::Execute(const Handle(WOKMake_HSequenceOfInputFile)& //---> EUG4YAN if ( !g_fCompOrLnk ) //<--- EUG4YAN - InfoMsg << "WOKStep_DynamicLibrary::Execute" + InfoMsg() << "WOKStep_DynamicLibrary::Execute" << "Creating : " << libname << endm; switch(ldshr->Execute()) @@ -234,7 +234,7 @@ void WOKStep_DynamicLibrary::Execute(const Handle(WOKMake_HSequenceOfInputFile)& outitem = new WOKernel_File(outent->Path()->FileName(), Unit(), libtype); break; default: - ErrorMsg << "WOKStep_DynamicLibrary::Execute" + ErrorMsg() << "WOKStep_DynamicLibrary::Execute" << "Unrecognized production : " << outent->Path()->FileName() << endm; SetFailed(); return; @@ -257,7 +257,7 @@ void WOKStep_DynamicLibrary::Execute(const Handle(WOKMake_HSequenceOfInputFile)& } } } - InfoMsg << "WOKStep_DynamicLibrary::Execute" + InfoMsg() << "WOKStep_DynamicLibrary::Execute" << "Succeeded : " << libname << endm; SetSucceeded(); //---> EUG4YAN @@ -265,7 +265,7 @@ void WOKStep_DynamicLibrary::Execute(const Handle(WOKMake_HSequenceOfInputFile)& //<--- EUG4YAN break; case WOKBuilder_Failed: - ErrorMsg << "WOKStep_DynamicLibrary::Execute" + ErrorMsg() << "WOKStep_DynamicLibrary::Execute" << "Failed : " << libname << endm; SetFailed(); break; diff --git a/src/WOKStep/WOKStep_EngDatFiles.cxx b/src/WOKStep/WOKStep_EngDatFiles.cxx index 146ce9c..1bf5437 100755 --- a/src/WOKStep/WOKStep_EngDatFiles.cxx +++ b/src/WOKStep/WOKStep_EngDatFiles.cxx @@ -138,7 +138,7 @@ void WOKStep_EngDatFiles::Execute(const Handle(WOKMake_HSequenceOfInputFile)& ex if(afile.IsNull()) { - ErrorMsg << "WOKStep_EngDatFiles::Execute" + ErrorMsg() << "WOKStep_EngDatFiles::Execute" << "Unable to locate file : " << astr << " in " << aunit->Name() << endm; SetFailed(); } @@ -155,7 +155,7 @@ void WOKStep_EngDatFiles::Execute(const Handle(WOKMake_HSequenceOfInputFile)& ex } else { - ErrorMsg << "WOKStep_EngDatFiles::Execute" + ErrorMsg() << "WOKStep_EngDatFiles::Execute" << "Could not locate interface : " << amsent->Name() << endm; SetFailed(); } @@ -179,7 +179,7 @@ void WOKStep_EngDatFiles::Execute(const Handle(WOKMake_HSequenceOfInputFile)& ex afile = new WOKernel_File(astr, Unit(), Unit()->GetFileType(engdattype)); afile->GetPath(); - InfoMsg << "WOKStep_EngDatFiles::Execute" + InfoMsg() << "WOKStep_EngDatFiles::Execute" << "Copy of : " << adatfile->Path()->Name() << " to " << afile->Path()->Name() << endm; switch(acmd->Copy(adatfile->Path(), afile->Path())) @@ -201,7 +201,7 @@ void WOKStep_EngDatFiles::Execute(const Handle(WOKMake_HSequenceOfInputFile)& ex break; case WOKBuilder_Failed: case WOKBuilder_Unbuilt: - ErrorMsg << "WOKStep_EngDatFiles::Execute" + ErrorMsg() << "WOKStep_EngDatFiles::Execute" << "Copy Failed" << endm; SetFailed(); break; diff --git a/src/WOKStep/WOKStep_EngLDFile.cxx b/src/WOKStep/WOKStep_EngLDFile.cxx index 8575026..a675859 100755 --- a/src/WOKStep/WOKStep_EngLDFile.cxx +++ b/src/WOKStep/WOKStep_EngLDFile.cxx @@ -121,7 +121,7 @@ void WOKStep_EngLDFile::Execute(const Handle(WOKMake_HSequenceOfInputFile)& exec if(!astream.good()) { - ErrorMsg << "WOKStep_EngLDFile::Execute" + ErrorMsg() << "WOKStep_EngLDFile::Execute" << "Could not open " << ldfile->Path()->Name()->ToCString() << " for writing" << endm; SetFailed(); return; diff --git a/src/WOKStep/WOKStep_EngLinkList.cxx b/src/WOKStep/WOKStep_EngLinkList.cxx index bdc1e3c..19826d9 100755 --- a/src/WOKStep/WOKStep_EngLinkList.cxx +++ b/src/WOKStep/WOKStep_EngLinkList.cxx @@ -82,7 +82,7 @@ void WOKStep_EngLinkList::ComputeInterface(const Handle(WOKernel_DevUnit)& aunit if(objfile.IsNull()) { - ErrorMsg << "WOKStep_EngLinkList::Execute" + ErrorMsg() << "WOKStep_EngLinkList::Execute" << "Could not locate object file for interface : " << aunit->Name() << endm; SetFailed(); } @@ -167,7 +167,7 @@ void WOKStep_EngLinkList::Execute(const Handle(WOKMake_HSequenceOfInputFile)& ex } else { - ErrorMsg << "WOKStep_EngLinkList::Execute" + ErrorMsg() << "WOKStep_EngLinkList::Execute" << "Could not locate interface : " << amsent->Name() << endm; SetFailed(); } @@ -177,7 +177,7 @@ void WOKStep_EngLinkList::Execute(const Handle(WOKMake_HSequenceOfInputFile)& ex if(inengine.IsNull()) { - ErrorMsg << "WOKStep_EngLinkList::Execute" + ErrorMsg() << "WOKStep_EngLinkList::Execute" << "Could determine current engine in InputList" << endm; SetFailed(); } diff --git a/src/WOKStep/WOKStep_Extract.cxx b/src/WOKStep/WOKStep_Extract.cxx index 2626996..377540b 100755 --- a/src/WOKStep/WOKStep_Extract.cxx +++ b/src/WOKStep/WOKStep_Extract.cxx @@ -147,13 +147,13 @@ void WOKStep_Extract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& tobuil case WOKBuilder_Success: { WOK_TRACE { - if(VerboseMsg("WOK_EXTRACT").IsSet()) + if(VerboseMsg()("WOK_EXTRACT").IsSet()) { - VerboseMsg << "WOKStep_Extract::Execute" + VerboseMsg() << "WOKStep_Extract::Execute" << entity->Name() << " produces : " << endm; for(i=1; i<=anit.Produces()->Length(); i++) { - VerboseMsg << "WOKStep_Extract::Execute" + VerboseMsg() << "WOKStep_Extract::Execute" << "\t\t" << anit.Produces()->Value(i)->Path()->Name() << endm; } } @@ -232,11 +232,11 @@ void WOKStep_Extract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& tobuil out->SetProduction(); if(!istemplate) AddExecDepItem(tobuild->Value(j), out, Standard_True); - InfoMsg << "WOKStep_Extract::Execute" << "File : " << outfile->Path()->Name() << " is modified" << endm; + InfoMsg() << "WOKStep_Extract::Execute" << "File : " << outfile->Path()->Name() << " is modified" << endm; break; case WOKBuilder_Unbuilt: WOK_TRACE { - VerboseMsg("WOK_EXTRACT") << "WOKStep_Extract::Execute" + VerboseMsg()("WOK_EXTRACT") << "WOKStep_Extract::Execute" << "File : " << outfile->Path()->Name() << " is unchanged" << endm; } Extractor()->MSchema()->ChangeAddAction(anid, Handle(WOKBuilder_Specification)()); @@ -252,7 +252,7 @@ void WOKStep_Extract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& tobuil Extractor()->MSchema()->ChangeActionToFailed(anid); SetFailed(); - ErrorMsg << "WOKStep_Extract::Execute" << "Failed : " << outfile->Name() << endm; + ErrorMsg() << "WOKStep_Extract::Execute" << "Failed : " << outfile->Name() << endm; break; } } @@ -261,7 +261,7 @@ void WOKStep_Extract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& tobuil case WOKBuilder_Failed: Extractor()->MSchema()->ChangeActionToFailed(anid); - ErrorMsg << "WOKStep_Extract::Execute" << "Failed : " << entity->Name() << endm; + ErrorMsg() << "WOKStep_Extract::Execute" << "Failed : " << entity->Name() << endm; break; default: break; } diff --git a/src/WOKStep/WOKStep_ExtractExecList.cxx b/src/WOKStep/WOKStep_ExtractExecList.cxx index 0019a12..aa653b3 100755 --- a/src/WOKStep/WOKStep_ExtractExecList.cxx +++ b/src/WOKStep/WOKStep_ExtractExecList.cxx @@ -133,30 +133,30 @@ _TEST_BREAK(); astep->SetTargets(Targets()); astep->SetOptions(Options()); - InfoMsg << "WOKStep_ExtractExecList::Execute" + InfoMsg() << "WOKStep_ExtractExecList::Execute" << "Extracting Executable list for part : " << part << endm; switch(astep->Make()) { case WOKMake_Uptodate: - InfoMsg << "WOKMake_MetaStep::Execute" + InfoMsg() << "WOKMake_MetaStep::Execute" << "========> " << astep->SubCode() << " is uptodate" << endm; break; case WOKMake_Success: - InfoMsg << "WOKMake_MetaStep::Execute" + InfoMsg() << "WOKMake_MetaStep::Execute" << "========> " << astep->SubCode() << " succeeded" << endm; break; case WOKMake_Incomplete: - WarningMsg << "WOKMake_MetaStep::Execute" + WarningMsg() << "WOKMake_MetaStep::Execute" << "========> " << astep->SubCode() << " is incomplete" << endm; break; case WOKMake_Failed: - ErrorMsg << "WOKMake_MetaStep::Execute" + ErrorMsg() << "WOKMake_MetaStep::Execute" << "========> " << astep->SubCode() << " failed" << endm; ok = Standard_False; break; case WOKMake_Unprocessed: - WarningMsg << "WOKMake_MetaStep::Execute" + WarningMsg() << "WOKMake_MetaStep::Execute" << "========> " << astep->SubCode() << " is still unprocessed" << endm; ok=Standard_False; break; @@ -205,7 +205,7 @@ _TEST_BREAK(); } else { - WarningMsg << "WOKStep_ExtractExecList::Execute" + WarningMsg() << "WOKStep_ExtractExecList::Execute" << "Missing file : " << files->Value(j) << " in unit : " << Unit()->Name() << endm; missings = Standard_True; } @@ -219,7 +219,7 @@ _TEST_BREAK(); if(unit.IsNull()) { - WarningMsg << "WOKStep_ExtractExecList::Execute" + WarningMsg() << "WOKStep_ExtractExecList::Execute" << "Wrong (or not found) libray uses : " << libs->Value(j) << endm; missings = Standard_True; } diff --git a/src/WOKStep/WOKStep_HeaderExtract.cxx b/src/WOKStep/WOKStep_HeaderExtract.cxx index 95cce54..a2b15d9 100755 --- a/src/WOKStep/WOKStep_HeaderExtract.cxx +++ b/src/WOKStep/WOKStep_HeaderExtract.cxx @@ -62,7 +62,7 @@ _TEST_BREAK(); if(anent.IsNull()) { - ErrorMsg << "WOKStep_HeaderExtract::OutOfDateEntities" + ErrorMsg() << "WOKStep_HeaderExtract::OutOfDateEntities" << infile->ID() << " is not a MS Entity" << endm; SetFailed(); return result; diff --git a/src/WOKStep/WOKStep_ImplementationDep.cxx b/src/WOKStep/WOKStep_ImplementationDep.cxx index 155d461..b86e04c 100755 --- a/src/WOKStep/WOKStep_ImplementationDep.cxx +++ b/src/WOKStep/WOKStep_ImplementationDep.cxx @@ -145,12 +145,12 @@ void WOKStep_ImplementationDep::Execute(const Handle(WOKMake_HSequenceOfInputFil { if(!myinflow.Contains(internlib->LocatorName())) { - WarningMsg << "WOKStep_ImplementationDep::Execute" + WarningMsg() << "WOKStep_ImplementationDep::Execute" << "Ignoring unlisted (in FILES) located " << INTERNLIB << " file " << endm; } else { - InfoMsg << "WOKStep_ImplementationDep::Execute" + InfoMsg() << "WOKStep_ImplementationDep::Execute" << "Using " << INTERNLIB << " file for implementation dependance" << endm; InternFile = myinflow.FindFromKey(internlib->LocatorName()); @@ -165,7 +165,7 @@ void WOKStep_ImplementationDep::Execute(const Handle(WOKMake_HSequenceOfInputFil if(myinflow.Contains(internlocname)) { - ErrorMsg << "WOKStep_ImplementationDep::Execute" + ErrorMsg() << "WOKStep_ImplementationDep::Execute" << "Could not locate listed (in FILES) " << INTERNLIB << " in unit : " << Unit()->Name() << endm; SetFailed(); @@ -264,7 +264,7 @@ void WOKStep_ImplementationDep::Execute(const Handle(WOKMake_HSequenceOfInputFil } else { - ErrorMsg << "WOKStep_ImplementationDep::Execute" + ErrorMsg() << "WOKStep_ImplementationDep::Execute" << "Could not find any input to get Implementation dependencies" << endm; SetFailed(); return; diff --git a/src/WOKStep/WOKStep_Include.cxx b/src/WOKStep/WOKStep_Include.cxx index c7ac9ee..48e6fa2 100755 --- a/src/WOKStep/WOKStep_Include.cxx +++ b/src/WOKStep/WOKStep_Include.cxx @@ -187,7 +187,7 @@ void WOKStep_Include::Execute(const Handle(WOKMake_HSequenceOfInputFile)& tobuil if ( fSrc.Failed () ) { - ErrorMsg << "WOKStep_Include :: Execute" + ErrorMsg() << "WOKStep_Include :: Execute" << "failed to copy '" << infile -> File () -> Path () -> Name () << "' to '" << pubincfile -> Path () -> Name () << "'" << endm; @@ -198,7 +198,7 @@ void WOKStep_Include::Execute(const Handle(WOKMake_HSequenceOfInputFile)& tobuil } else { - InfoMsg << "WOKStep_Include :: Execute" + InfoMsg() << "WOKStep_Include :: Execute" << "Copied : '" << infile->File()->Path()->Name() << "' to '" << pubincfile->Path()->Name() << "'" << endm; @@ -217,7 +217,7 @@ void WOKStep_Include::Execute(const Handle(WOKMake_HSequenceOfInputFile)& tobuil } else { if ( !(infile -> File () -> Path () -> Exists () )) { - InfoMsg << "WOKStep_Include :: Execute" + InfoMsg() << "WOKStep_Include :: Execute" << "failed to copy '" << infile -> File () -> Path () -> Name () << "' to '" << pubincfile -> Path () -> Name () << "'" << endm; diff --git a/src/WOKStep/WOKStep_JiniExtract.cxx b/src/WOKStep/WOKStep_JiniExtract.cxx index 6d64af8..a321ce1 100755 --- a/src/WOKStep/WOKStep_JiniExtract.cxx +++ b/src/WOKStep/WOKStep_JiniExtract.cxx @@ -231,7 +231,7 @@ Handle(WOKMake_HSequenceOfInputFile) WOKStep_JiniExtract::OutOfDateEntities() if(anent.IsNull()) { - ErrorMsg << "WOKStep_JiniExtract::OutOfDateEntities" + ErrorMsg() << "WOKStep_JiniExtract::OutOfDateEntities" << infile->ID() << " is not a MS Entity" << endm; SetFailed(); return result; @@ -323,16 +323,16 @@ nextPass: case WOKBuilder_Success: { #ifdef WOK_VERBOSE - if ( VerboseMsg ( "WOK_EXTRACT" ).IsSet () ) { + if ( VerboseMsg() ( "WOK_EXTRACT" ).IsSet () ) { - VerboseMsg ( "WOK_EXTRACT" ) << "WOKStep_Extract::Execute" + VerboseMsg() ( "WOK_EXTRACT" ) << "WOKStep_Extract::Execute" << entity -> Name () << " produces : " << endm; for ( i = 1; i <= anit.Produces () -> Length (); ++i ) - VerboseMsg ( "WOK_EXTRACT" ) << "WOKStep_Extract::Execute" + VerboseMsg() ( "WOK_EXTRACT" ) << "WOKStep_Extract::Execute" << "\t\t" << anit.Produces () -> Value ( i ) -> Path () -> Name () << endm; @@ -457,7 +457,7 @@ nextPass: if ( !istemplate ) AddExecDepItem ( buildSeq -> Value ( j ), out, Standard_True ); - InfoMsg << "WOKStep_Extract::Execute" + InfoMsg() << "WOKStep_Extract::Execute" << "File : " << outfile -> Path () -> Name () << " is modified" @@ -467,7 +467,7 @@ nextPass: case WOKBuilder_Unbuilt: #ifdef WOK_VERBOSE - VerboseMsg ( "WOK_EXTRACT" ) << "WOKStep_Extract::Execute" + VerboseMsg() ( "WOK_EXTRACT" ) << "WOKStep_Extract::Execute" << "File : " << outfile -> Path () -> Name () << " is unchanged" @@ -488,7 +488,7 @@ nextPass: SetFailed (); - ErrorMsg << "WOKStep_Extract::Execute" + ErrorMsg() << "WOKStep_Extract::Execute" << "Failed : " << outfile -> Name () << endm; @@ -505,7 +505,7 @@ nextPass: case WOKBuilder_Failed: - ErrorMsg << "WOKStep_Extract::Execute" + ErrorMsg() << "WOKStep_Extract::Execute" << "Failed : " << entity -> Name () << endm; @@ -526,7 +526,7 @@ nextPass: } // end if - InfoMsg << "WOKStep_Extract::Execute" << "Generating ClassFile.cfg" << endm; + InfoMsg() << "WOKStep_Extract::Execute" << "Generating ClassFile.cfg" << endm; #ifdef WNT Handle( TCollection_HAsciiString ) NL = new TCollection_HAsciiString ( "\r\n" ); #else diff --git a/src/WOKStep/WOKStep_LibExtract.cxx b/src/WOKStep/WOKStep_LibExtract.cxx index 27add33..b0b5553 100755 --- a/src/WOKStep/WOKStep_LibExtract.cxx +++ b/src/WOKStep/WOKStep_LibExtract.cxx @@ -142,7 +142,7 @@ void WOKStep_LibExtract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& exe case WOKBuilder_Success: { Handle(WOKBuilder_ArchiveLibrary) anent = new WOKBuilder_ArchiveLibrary(liba->Path()); - InfoMsg << "WOKStep_TKLibUnCompress::Execute" + InfoMsg() << "WOKStep_TKLibUnCompress::Execute" << "Uncompress : " << infile->File()->UserPathName() << endm; anext->SetArchive(anent); @@ -158,7 +158,7 @@ void WOKStep_LibExtract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& exe } else { - ErrorMsg << "WOKStep_LibExtract::Execute" + ErrorMsg() << "WOKStep_LibExtract::Execute" << "Unrecognized input file : " << infile->ID() << endm; SetFailed(); return; @@ -167,7 +167,7 @@ void WOKStep_LibExtract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& exe if(!failed) { - InfoMsg << "WOKStep_LibExtract::Execute" + InfoMsg() << "WOKStep_LibExtract::Execute" << "Extracting : " << infile->File()->UserPathName() << endm; switch(anext->Execute()) @@ -193,7 +193,7 @@ void WOKStep_LibExtract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& exe } else { - WarningMsg << "WOKStep_LibExtract::Execute" + WarningMsg() << "WOKStep_LibExtract::Execute" << "Ignoring non object result : " << anent->Path()->Name() << endm; failed = Standard_True; } diff --git a/src/WOKStep/WOKStep_LibLimit.cxx b/src/WOKStep/WOKStep_LibLimit.cxx index 08abdb4..dcbfa0a 100755 --- a/src/WOKStep/WOKStep_LibLimit.cxx +++ b/src/WOKStep/WOKStep_LibLimit.cxx @@ -237,24 +237,24 @@ void WOKStep_LibLimit::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execl switch(astep->Make()) { case WOKMake_Uptodate: - InfoMsg << "WOKStep_LibLimit::Execute" + InfoMsg() << "WOKStep_LibLimit::Execute" << "========> " << astep->SubCode() << " is uptodate" << endm; break; case WOKMake_Success: - InfoMsg << "WOKStep_LibLimit::Execute" + InfoMsg() << "WOKStep_LibLimit::Execute" << "========> " << astep->SubCode() << " succeeded" << endm; break; case WOKMake_Incomplete: - WarningMsg << "WOKStep_LibLimit::Execute" + WarningMsg() << "WOKStep_LibLimit::Execute" << "========> " << astep->SubCode() << " is incomplete" << endm; break; case WOKMake_Failed: - ErrorMsg << "WOKStep_LibLimit::Execute" + ErrorMsg() << "WOKStep_LibLimit::Execute" << "========> " << astep->SubCode() << " failed" << endm; ok = Standard_False; break; case WOKMake_Unprocessed: - WarningMsg << "WOKStep_LibLimit::Execute" + WarningMsg() << "WOKStep_LibLimit::Execute" << "========> " << astep->SubCode() << " is still unprocessed" << endm; ok=Standard_False; break; @@ -282,7 +282,7 @@ void WOKStep_LibLimit::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execl } else { - InfoMsg << "WOKStep_LibLimit::Execute" + InfoMsg() << "WOKStep_LibLimit::Execute" << "No limitation required" << endm; for( i=1; i<=execlist->Length(); i++) { diff --git a/src/WOKStep/WOKStep_LibUnCompress.cxx b/src/WOKStep/WOKStep_LibUnCompress.cxx index 8a0cfae..b80a714 100755 --- a/src/WOKStep/WOKStep_LibUnCompress.cxx +++ b/src/WOKStep/WOKStep_LibUnCompress.cxx @@ -108,7 +108,7 @@ void WOKStep_LibUnCompress::Execute(const Handle(WOKMake_HSequenceOfInputFile)& liba->GetPath(); - InfoMsg << "WOKStep_LibUnCompress::Execute" + InfoMsg() << "WOKStep_LibUnCompress::Execute" << "Uncompress : " << infile->File()->UserPathName() << endm; switch(acmd->UnCompressTo(infile->File()->Path(), liba->Path())) diff --git a/src/WOKStep/WOKStep_Link.cxx b/src/WOKStep/WOKStep_Link.cxx index bf2f994..49111b3 100755 --- a/src/WOKStep/WOKStep_Link.cxx +++ b/src/WOKStep/WOKStep_Link.cxx @@ -244,7 +244,7 @@ Handle(WOKBuilder_HSequenceOfLibrary) WOKStep_Link::ComputeLibraryList(const Han } else { - WarningMsg << "WOKStep_LinkList::GetUnitLibrary" + WarningMsg() << "WOKStep_LinkList::GetUnitLibrary" << "Unknown Nesting for " << aunit->UserPathName() << endm; } } @@ -257,7 +257,7 @@ Handle(WOKBuilder_HSequenceOfLibrary) WOKStep_Link::ComputeLibraryList(const Han if(alib.IsNull()) { - ErrorMsg << "WOKStep_Link::ComputeLibraryList" + ErrorMsg() << "WOKStep_Link::ComputeLibraryList" << "Could not find library in unit : " << aunit->UserPathName() << endm; SetFailed(); } @@ -390,7 +390,7 @@ Handle(WOKUtils_HSequenceOfPath) WOKStep_Link::ComputeLibrarySearchList(const Ha { if(!amapcalc.Contains(anit.Key())) { - WarningMsg << "WOKStep_Link::ComputeLibrarySearchList" + WarningMsg() << "WOKStep_Link::ComputeLibrarySearchList" << "Library directory " << anit.Key()->Name() << " referenced in link is not in visibility" << endm; } anit.Next(); @@ -429,7 +429,7 @@ WOKMake_Status WOKStep_Link::ExecuteLink(Handle(WOKMake_HSequenceOfOutputFile)& lnkfile->GetPath(); if(lnkfile->Path()->Exists()) lnkfile->Path()->RemoveFile(); if (!lnkfile->Path()->CreateFile()) { - ErrorMsg << "WOKStep_Link::ExecuteLink" + ErrorMsg() << "WOKStep_Link::ExecuteLink" << "Unable to create link file " << lnkfile->Path()->Name()->ToCString() << endm; } Handle(WOKUtils_Shell) ashell = Shell(); @@ -497,7 +497,7 @@ WOKMake_Status WOKStep_Link::ExecuteLink(Handle(WOKMake_HSequenceOfOutputFile)& } break; case WOKBuilder_Failed: - ErrorMsg << "WOKStep_Link::ExecuteLink" << "Failed : " << mytarget << endm; + ErrorMsg() << "WOKStep_Link::ExecuteLink" << "Failed : " << mytarget << endm; SetFailed(); break; default: break; diff --git a/src/WOKStep/WOKStep_LinkList.cxx b/src/WOKStep/WOKStep_LinkList.cxx index 9b61f29..2cb480c 100755 --- a/src/WOKStep/WOKStep_LinkList.cxx +++ b/src/WOKStep/WOKStep_LinkList.cxx @@ -167,7 +167,7 @@ Handle(WOKMake_OutputFile) WOKStep_LinkList::GetUnitLibrary(const Handle(WOKerne } else { - WarningMsg << "WOKStep_LinkList::GetUnitLibrary" + WarningMsg() << "WOKStep_LinkList::GetUnitLibrary" << "Unknown Nesting for " << aunit->UserPathName() << endm; } } @@ -196,13 +196,13 @@ Handle(WOKMake_OutputFile) WOKStep_LinkList::GetUnitLibrary(const Handle(WOKerne Standard_Boolean mustExist = aunit->SearchInFileList(Locator(),libname); if (mustExist) { - ErrorMsg << "WOKStep_LinkList::GetUnitLibrary" + ErrorMsg() << "WOKStep_LinkList::GetUnitLibrary" << "No library (" << libname << ") found for unit " << aunit->Name() << endm; SetFailed(); } else { #ifdef DEB - WarningMsg << "WOKStep_LinkList::GetUnitLibrary" + WarningMsg() << "WOKStep_LinkList::GetUnitLibrary" << "No library (" << libname << ") in unit " << aunit->Name() << endm; #endif } @@ -235,7 +235,7 @@ Handle(WOKMake_OutputFile) WOKStep_LinkList::GetUnitLibrary(const Handle(WOKerne } else { - WarningMsg << "WOKStep_LinkList::GetUnitLibrary" + WarningMsg() << "WOKStep_LinkList::GetUnitLibrary" << "Unit " << aunit->UserPathName() << " is not known to have a library" << endm; } @@ -316,7 +316,7 @@ Handle(TCollection_HAsciiString) WOKStep_LinkList::GetUnitContributionCodes(cons if(codes.IsNull()) { - WarningMsg << "WOKStep_LinkList::GetUnitContributionCodes" + WarningMsg() << "WOKStep_LinkList::GetUnitContributionCodes" << "Could not eval parameter " << paramname << " in unit " << aunit->UserPathName() << endm; } return codes; @@ -338,7 +338,7 @@ void WOKStep_LinkList::AddWorkbenchUnitContribution(const Handle(WOKMake_InputFi if(codes.IsNull()) { - WarningMsg << "WOKStep_LinkList::GetUnitContribution" + WarningMsg() << "WOKStep_LinkList::GetUnitContribution" << "Could not eval contribution of unit : " << aunit->UserPathName() << " in link of " << Unit()->UserPathName() << endm; } else @@ -352,7 +352,7 @@ void WOKStep_LinkList::AddWorkbenchUnitContribution(const Handle(WOKMake_InputFi if(!step.IsNull()) { - InfoMsg << "WOKStep_LinkList::GetUnitContribution" + InfoMsg() << "WOKStep_LinkList::GetUnitContribution" << "Processing step " << step->UniqueName() << endm; //---> EUG4JR @@ -380,7 +380,7 @@ void WOKStep_LinkList::AddWorkbenchUnitContribution(const Handle(WOKMake_InputFi //<--- EUG4JR if(outfiles.IsNull()) { - ErrorMsg << "WOKStep_LinkList::GetUnitContribution" + ErrorMsg() << "WOKStep_LinkList::GetUnitContribution" << "Could not obtain output list of step : " << code << " in unit " << aunit->UserPathName() << endm; failed = Standard_True; } @@ -432,7 +432,7 @@ void WOKStep_LinkList::AddWorkbenchUnitContribution(const Handle(WOKMake_InputFi } else { - WarningMsg << "WOKStep_ComputeLinkList" + WarningMsg() << "WOKStep_ComputeLinkList" << "Ignoring invalid step code " << code << " in unit " << aunit->UserPathName() << endm; } k++; diff --git a/src/WOKStep/WOKStep_MSFill.cxx b/src/WOKStep/WOKStep_MSFill.cxx index 3656548..2f9385e 100755 --- a/src/WOKStep/WOKStep_MSFill.cxx +++ b/src/WOKStep/WOKStep_MSFill.cxx @@ -130,7 +130,7 @@ void WOKStep_MSFill::Execute(const Handle(WOKMake_HSequenceOfInputFile)& ) if(gefile.IsNull()) { - ErrorMsg << "WOKStep_MSFill::Execute" << "Missing file : " << ams->AssociatedFile(Unit()->Name()) << endm; + ErrorMsg() << "WOKStep_MSFill::Execute" << "Missing file : " << ams->AssociatedFile(Unit()->Name()) << endm; SetFailed(); return; } @@ -188,7 +188,7 @@ _TEST_BREAK(); case WOKBuilder_Success: break; case WOKBuilder_Failed: - ErrorMsg << "WOKStep_MSFill::Execute" + ErrorMsg() << "WOKStep_MSFill::Execute" << "Errors occured while executing " << anaction->Entity()->Name() << endm; anit.Reset(); stop = Standard_True; @@ -197,7 +197,7 @@ _TEST_BREAK(); } else { - ErrorMsg << "WOKStep_MSFill::Execute" + ErrorMsg() << "WOKStep_MSFill::Execute" << "No file " << astr << " in " << aunitname << endm; stop = Standard_True; } @@ -211,13 +211,13 @@ _TEST_BREAK(); if(!ams->MetaSchema()->Check(Unit()->Name())) { - ErrorMsg << "WOKStep_MSFill::Execute" + ErrorMsg() << "WOKStep_MSFill::Execute" << "Check of " << Unit()->Name() << " has failed" << endm; stop = Standard_True; } else { - InfoMsg << "WOKStep_MSFill::Execute" + InfoMsg() << "WOKStep_MSFill::Execute" << "Check of " << Unit()->Name() << " succeeded" << endm; } } @@ -249,8 +249,8 @@ _TEST_BREAK(); if(infile.IsNull()) { - WarningMsg << "WOKStep_MSFill::Execute" << origin->LocatorName() << " is not an input of this step" << endm; - WarningMsg << "WOKStep_MSFill::Execute" << "Perhaps performing step (src) is needed" << endm; + WarningMsg() << "WOKStep_MSFill::Execute" << origin->LocatorName() << " is not an input of this step" << endm; + WarningMsg() << "WOKStep_MSFill::Execute" << "Perhaps performing step (src) is needed" << endm; } else { @@ -326,14 +326,14 @@ _TEST_BREAK(); } else { - ErrorMsg << "WOKStep_MSFill::Execute" + ErrorMsg() << "WOKStep_MSFill::Execute" << "Unit : " << aunit->Name() << " should be an interface and is not" << endm; stop = Standard_True; } } else { - ErrorMsg << "WOKStep_MSFill::Execute" + ErrorMsg() << "WOKStep_MSFill::Execute" << "Unit : " << ints->Value(i) << " could not be located" << endm; stop = Standard_True; } @@ -361,14 +361,14 @@ _TEST_BREAK(); } else { - ErrorMsg << "WOKStep_MSFill::Execute" + ErrorMsg() << "WOKStep_MSFill::Execute" << "Unit : " << aunit->Name() << " should be an interface and is not" << endm; stop = Standard_True; } } else { - ErrorMsg << "WOKStep_MSFill::Execute" + ErrorMsg() << "WOKStep_MSFill::Execute" << "Unit : EngineInterface could not be located" << endm; stop = Standard_True; } diff --git a/src/WOKStep/WOKStep_ProcessStep.cxx b/src/WOKStep/WOKStep_ProcessStep.cxx index 30e6a56..2fd3e52 100755 --- a/src/WOKStep/WOKStep_ProcessStep.cxx +++ b/src/WOKStep/WOKStep_ProcessStep.cxx @@ -140,7 +140,7 @@ Handle(TCollection_HAsciiString) WOKStep_ProcessStep::GetUnitName(const Handle(T if(rejectlist->Search(basename) != -1) { WOK_TRACE { - VerboseMsg("WOK_IDEP") << "WOKStep_ProcessStep::GetUnitName" + VerboseMsg()("WOK_IDEP") << "WOKStep_ProcessStep::GetUnitName" << "Rejected include : " << aincpath << endm; } return unitname; @@ -312,7 +312,7 @@ void WOKStep_ProcessStep::TreatOutput(const Handle(WOKMake_InputFile)& infile, c if(aoutfile.IsNull() && extens != WOKUtils_MFile) { - ErrorMsg << "WOKStep_ProcessStep::Execute" + ErrorMsg() << "WOKStep_ProcessStep::Execute" << "Unrecognized file : " << outent->Path()->Name() << endm; } if(!aoutfile.IsNull()) diff --git a/src/WOKStep/WOKStep_ResourceSource.cxx b/src/WOKStep/WOKStep_ResourceSource.cxx index ac463d6..f8d846c 100755 --- a/src/WOKStep/WOKStep_ResourceSource.cxx +++ b/src/WOKStep/WOKStep_ResourceSource.cxx @@ -82,7 +82,7 @@ void WOKStep_ResourceSource::ReadFILES(const Handle(WOKMake_InputFile)& FILES) Handle(TCollection_HAsciiString) filenameFILES = Unit()->Params().Eval("%FILENAME_FILES"); if (strcmp(filenameFILES->ToCString(),astr->ToCString())) { - ErrorMsg << "WOKStep_ResourceSource::ReadFILES" + ErrorMsg() << "WOKStep_ResourceSource::ReadFILES" << "No type specified for file " << astr << endm; SetFailed(); } @@ -98,7 +98,7 @@ void WOKStep_ResourceSource::ReadFILES(const Handle(WOKMake_InputFile)& FILES) { if(theType->IsStationDependent() || theType->IsDBMSDependent()) { - WarningMsg << "WOKStep_ResourceSource::ReadFILES" + WarningMsg() << "WOKStep_ResourceSource::ReadFILES" << "Station or DBMS Dependent type " << type << " : ignoring file " << name << endm; } else @@ -107,7 +107,7 @@ void WOKStep_ResourceSource::ReadFILES(const Handle(WOKMake_InputFile)& FILES) if(afile.IsNull() == Standard_True) { - ErrorMsg << "WOKStep_ResourceSource::ReadFILES" + ErrorMsg() << "WOKStep_ResourceSource::ReadFILES" << "File " << astr->ToCString() << " could not be found" << endm; SetFailed(); } @@ -123,7 +123,7 @@ void WOKStep_ResourceSource::ReadFILES(const Handle(WOKMake_InputFile)& FILES) } else { - ErrorMsg << "WOKStep_ResourceSource::ReadFILES" + ErrorMsg() << "WOKStep_ResourceSource::ReadFILES" << "Type unknown : " << type << " for file : " << name << endm; SetFailed(); } diff --git a/src/WOKStep/WOKStep_Source.cxx b/src/WOKStep/WOKStep_Source.cxx index a3cc50e..6ec658a 100755 --- a/src/WOKStep/WOKStep_Source.cxx +++ b/src/WOKStep/WOKStep_Source.cxx @@ -142,7 +142,7 @@ _TEST_BREAK(); if(afile.IsNull() == Standard_True) { - ErrorMsg << "WOKStep_Source::ReadFILES" + ErrorMsg() << "WOKStep_Source::ReadFILES" << "File " << astr->ToCString() << " could not be found" << endm; SetFailed(); return; diff --git a/src/WOKStep/WOKStep_SourceExtract.cxx b/src/WOKStep/WOKStep_SourceExtract.cxx index e811043..5e0e27d 100755 --- a/src/WOKStep/WOKStep_SourceExtract.cxx +++ b/src/WOKStep/WOKStep_SourceExtract.cxx @@ -102,7 +102,7 @@ _TEST_BREAK(); if(msent.IsNull()) { SetFailed(); - ErrorMsg << "WOKStep_SourceExtract::Execute" + ErrorMsg() << "WOKStep_SourceExtract::Execute" << buildfile->BuilderEntity()->Path()->Name() << " is not a MS Type" << endm; } else @@ -118,7 +118,7 @@ _TEST_BREAK(); if(afile.IsNull()) { - WarningMsg << "WOKStep_SourceExtract::Execute" + WarningMsg() << "WOKStep_SourceExtract::Execute" << "Missing CDL deducted source file : " << aseq->Value(j) << endm; afile = new WOKernel_File(aseq->Value(j), Unit(), Unit()->GetFileType("source")); afile->GetPath(); diff --git a/src/WOKStep/WOKStep_TKList.cxx b/src/WOKStep/WOKStep_TKList.cxx index 2eed460..6b5256c 100755 --- a/src/WOKStep/WOKStep_TKList.cxx +++ b/src/WOKStep/WOKStep_TKList.cxx @@ -85,7 +85,7 @@ Standard_Boolean WOKStep_TKList::HandleInputFile(const Handle(WOKMake_InputFile) if(astr.IsNull()) { - ErrorMsg << "WOKStep_TKList::HandleInputFile" + ErrorMsg() << "WOKStep_TKList::HandleInputFile" << "Could not eval parameter %FILENAME_PACKAGES" << endm; SetFailed(); return Standard_False; @@ -127,7 +127,7 @@ Handle(TCollection_HAsciiString) WOKStep_TKList::GetUnitContributionCodes(const if(codes.IsNull()) { - WarningMsg << "WOKStep_WNTK::GetUnitContributionCodes" + WarningMsg() << "WOKStep_WNTK::GetUnitContributionCodes" << "Could not eval parameter " << paramname << " in unit " << aunit->UserPathName() << endm; } return codes; @@ -176,7 +176,7 @@ void WOKStep_TKList::AddParcelUnitContribution(const Handle(WOKMake_InputFile)& return; #else - ErrorMsg << "WOKStep_TKList::AddParcelUnitContribution " + ErrorMsg() << "WOKStep_TKList::AddParcelUnitContribution " << "Cannot add unit " << unit << " from parcel on Windows NT: feature not available" << endm; SetFailed(); return; @@ -194,7 +194,7 @@ void WOKStep_TKList::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execlis { if(execlist->Length() > 1) { - ErrorMsg << "WOKStep_TKList::Execute" << "Too many input files in step" << endm; + ErrorMsg() << "WOKStep_TKList::Execute" << "Too many input files in step" << endm; SetFailed(); return; } @@ -221,7 +221,7 @@ void WOKStep_TKList::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execlis if(unit.IsNull()) { - ErrorMsg << "WOKStep_TKList::Execute" + ErrorMsg() << "WOKStep_TKList::Execute" << "Could not locate unit " << astr << " listed in file PACKAGES" << endm; SetFailed(); return; diff --git a/src/WOKStep/WOKStep_TKReplace.cxx b/src/WOKStep/WOKStep_TKReplace.cxx index 17f43eb..24abed3 100755 --- a/src/WOKStep/WOKStep_TKReplace.cxx +++ b/src/WOKStep/WOKStep_TKReplace.cxx @@ -185,7 +185,7 @@ void WOKStep_TKReplace::LoadTKDefs() } else { - WarningMsg << "WOKStep_TKReplace::Execute" + WarningMsg() << "WOKStep_TKReplace::Execute" << "Unreadable TOOLKITS file not taken into account" << endm; } } @@ -249,9 +249,9 @@ void WOKStep_TKReplace::LoadTKDefs() if(PACKAGES.IsNull()) { if (IsAuthorized(atk)) { - WarningMsg << "WOKStep_TKReplace::Execute" + WarningMsg() << "WOKStep_TKReplace::Execute" << "Could not find PACKAGES file for toolkit : " << atk << endm; - WarningMsg << "WOKStep_TKReplace::Execute" + WarningMsg() << "WOKStep_TKReplace::Execute" << "Toolkit " << atk << "is ignored" << endm; } } @@ -264,7 +264,7 @@ void WOKStep_TKReplace::LoadTKDefs() if(udsoftk.IsNull()) { - ErrorMsg << "WOKStep_TKReplace::Execute" + ErrorMsg() << "WOKStep_TKReplace::Execute" << "Could not read file " << PACKAGES->Path()->Name() << endm; SetFailed(); return; @@ -276,7 +276,7 @@ void WOKStep_TKReplace::LoadTKDefs() if(udidx == 0) { - ErrorMsg << "WOKStep_TKReplace::Execute" + ErrorMsg() << "WOKStep_TKReplace::Execute" << "Unknown unit (" << udsoftk->Value(j) << ") listed in packages of : " << atk << endm; SetFailed(); return; @@ -379,10 +379,10 @@ _TEST_BREAK(); { if(!result.IsNull()) { - WarningMsg << "WOKStep_TKReplace::GetTKForUnit" + WarningMsg() << "WOKStep_TKReplace::GetTKForUnit" << "More than one toolkit contains " << aunit << " using " << result << " ignoring " << mytks(i) << endm; #if 0 - WarningMsg << "WOKStep_TKReplace::GetTKForUnit" + WarningMsg() << "WOKStep_TKReplace::GetTKForUnit" << "You can specify the toolkit used using a TOOLKITS file" << endm; #endif } @@ -478,7 +478,7 @@ Handle(WOKMake_OutputFile) WOKStep_TKReplace::SubstituteInput(const Handle(WOKMa { if(myorig.Contains(current)) { - WarningMsg << "WOKStep_TKReplace::SubstituteInput" + WarningMsg() << "WOKStep_TKReplace::SubstituteInput" << implied << " (implied by " << curtk << " defining " << current << ")" << " implies addition of " << outfile->ID() << endm; } @@ -511,7 +511,7 @@ Handle(WOKMake_OutputFile) WOKStep_TKReplace::SubstituteInput(const Handle(WOKMa Handle(TColStd_HSequenceOfHAsciiString) thevisib = theunitwb->Visibility(); for (Standard_Integer i=2; i<= thevisib->Length(); i++) { if (!strcmp(thevisib->Value(i)->ToCString(), thetknest->FullName()->ToCString())) { - WarningMsg << "WOKStep_TKReplace::SubstituteInput" + WarningMsg() << "WOKStep_TKReplace::SubstituteInput" << "Toolkit " << TKUnit->Name() << " in " << thetknest->Name() << " hides unit " << TheUnit->Name() << " in " << theunitwb->Name() << endm; } diff --git a/src/WOKStep/WOKStep_WNTK.cxx b/src/WOKStep/WOKStep_WNTK.cxx index 6f06380..bb6802b 100755 --- a/src/WOKStep/WOKStep_WNTK.cxx +++ b/src/WOKStep/WOKStep_WNTK.cxx @@ -64,7 +64,7 @@ Standard_Boolean WOKStep_WNTK::HandleInputFile(const Handle(WOKMake_InputFile)& if(filePACKAGES.IsNull()) { - ErrorMsg << "WOKStep_WNTK::HandleInputFile" + ErrorMsg() << "WOKStep_WNTK::HandleInputFile" << "Could not eval parameter '%FILENAME_PACKAGES'" << endm; SetFailed(); return Standard_False; @@ -87,7 +87,7 @@ void WOKStep_WNTK::Execute(const Handle(WOKMake_HSequenceOfInputFile)& anExecLis { if( anExecList->Length() > 1 ) { - ErrorMsg << "WOKStep_WNTK::Execute" + ErrorMsg() << "WOKStep_WNTK::Execute" << "Too many input files in step" << endm; SetFailed(); return; @@ -118,7 +118,7 @@ void WOKStep_WNTK::Execute(const Handle(WOKMake_HSequenceOfInputFile)& anExecLis if(stubIn.IsNull()) { - ErrorMsg << "WOKStep_WNTK::Execute" + ErrorMsg() << "WOKStep_WNTK::Execute" << "Could not eval parameter " << stubIn << endm; SetFailed(); return; @@ -128,7 +128,7 @@ void WOKStep_WNTK::Execute(const Handle(WOKMake_HSequenceOfInputFile)& anExecLis if(stubOut.IsNull()) { - ErrorMsg << "WOKStep_WNTK::Execute" + ErrorMsg() << "WOKStep_WNTK::Execute" << "Could not eval parameter " << stubOut << endm; SetFailed(); return; @@ -141,7 +141,7 @@ void WOKStep_WNTK::Execute(const Handle(WOKMake_HSequenceOfInputFile)& anExecLis if(!os) { - ErrorMsg << "WOKStep_WNTK::Execute" + ErrorMsg() << "WOKStep_WNTK::Execute" << "Could not create stub file" << endm; SetFailed(); return; @@ -163,7 +163,7 @@ void WOKStep_WNTK::Execute(const Handle(WOKMake_HSequenceOfInputFile)& anExecLis if( unit.IsNull() ) { - ErrorMsg << "WOKStep_WNTK::Execute" + ErrorMsg() << "WOKStep_WNTK::Execute" << "Could not locate unit " << aStr << " listed in PACKAGES file" << endm; SetFailed(); return; @@ -171,7 +171,7 @@ void WOKStep_WNTK::Execute(const Handle(WOKMake_HSequenceOfInputFile)& anExecLis if( !(WOKernel_IsPackage(unit) || WOKernel_IsNocdlpack(unit) || WOKernel_IsDelivery(unit) || WOKernel_IsClient(unit) || WOKernel_IsSchema ( unit ))) { - ErrorMsg << "WOKStep_WNTK::Execute" + ErrorMsg() << "WOKStep_WNTK::Execute" << "Unit " << aStr << " of type " << unit->Type() << " can not be listed in PACKAGES file" << endm; SetFailed(); @@ -189,7 +189,7 @@ void WOKStep_WNTK::Execute(const Handle(WOKMake_HSequenceOfInputFile)& anExecLis if( !os.good() ) { - ErrorMsg << "WOKStep_WNTK::Execute" + ErrorMsg() << "WOKStep_WNTK::Execute" << "Could not create stub file" << endm; SetFailed(); return; @@ -202,7 +202,7 @@ void WOKStep_WNTK::Execute(const Handle(WOKMake_HSequenceOfInputFile)& anExecLis if( cmd.IsNull() ) { - ErrorMsg << "WOKStep_WNTK::Execute" + ErrorMsg() << "WOKStep_WNTK::Execute" << "Could not eval template STUBS_COMPILE" << endm; SetFailed(); return; @@ -213,7 +213,7 @@ void WOKStep_WNTK::Execute(const Handle(WOKMake_HSequenceOfInputFile)& anExecLis if(sh->Status()) { - ErrorMsg << "WOKStep_WNTK::Execute" + ErrorMsg() << "WOKStep_WNTK::Execute" << "Could not compile stub file" << endm; SetFailed(); return; diff --git a/src/WOKStep/WOKStep_WNTLibrary.cxx b/src/WOKStep/WOKStep_WNTLibrary.cxx index 20c0ddb..63a4ae5 100755 --- a/src/WOKStep/WOKStep_WNTLibrary.cxx +++ b/src/WOKStep/WOKStep_WNTLibrary.cxx @@ -152,7 +152,7 @@ void WOKStep_WNTLibrary::Execute (const Handle(WOKMake_HSequenceOfInputFile)& an if(numRes != numProd) - WarningMsg << "WOKStep_WNTLibrary :: Execute" + WarningMsg() << "WOKStep_WNTLibrary :: Execute" << tool -> Produces () -> Value ( 1 ) -> Path () -> FileName () << " does not contain exported symbols" << endm; diff --git a/src/WOKStep/WOKStep_WNTLink.cxx b/src/WOKStep/WOKStep_WNTLink.cxx index 0a572b1..42c970b 100755 --- a/src/WOKStep/WOKStep_WNTLink.cxx +++ b/src/WOKStep/WOKStep_WNTLink.cxx @@ -133,7 +133,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKStep_WNTLink::ComputeExternals(const if(external.IsNull()) { - WarningMsg << "WOKStep_WNTLink::ComputeExternals" + WarningMsg() << "WOKStep_WNTLink::ComputeExternals" << "Skipped external " << infile->ID()->Token(":", 3) << "; could not eval : " << astr << endm; } else @@ -176,7 +176,7 @@ void WOKStep_WNTLink::Execute(const Handle(WOKMake_HSequenceOfInputFile)& if(libType.IsNull()) { - WarningMsg << "WOKStep_WNTLink::Execute" + WarningMsg() << "WOKStep_WNTLink::Execute" << "Unknown link : library is produced" << endm; libType = Unit()->GetFileType("library"); } @@ -411,11 +411,11 @@ dummyStepFile: //---> EUG4YAN if ( !g_fCompOrLnk ) //<--- EUG4YAN - InfoMsg << "WOKStep_WNTLink::Execute" + InfoMsg() << "WOKStep_WNTLink::Execute" << "------------" << endm << "" << endm; #else - ErrorMsg << "WOKStep_WNTLink::Execute" + ErrorMsg() << "WOKStep_WNTLink::Execute" << "Step WOKStep_WNTLink is available only on WNT platforms." << endm; SetFailed(); #endif // WNT