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=61047fad7e7100099431790bc8cef2a7827c93de;p=occt-wok.git OCC20850 umake command do not work on SunOS10 --- diff --git a/src/WOKOrbix/WOKOrbix_ExtractServerList.cxx b/src/WOKOrbix/WOKOrbix_ExtractServerList.cxx index 0959d5b..76dec1e 100755 --- a/src/WOKOrbix/WOKOrbix_ExtractServerList.cxx +++ b/src/WOKOrbix/WOKOrbix_ExtractServerList.cxx @@ -108,7 +108,7 @@ void WOKOrbix_ExtractServerList::Execute(const Handle(WOKMake_HSequenceOfInputFi if(apos < 0 ) { - ErrorMsg << "WOKOrbix_ExtractServerList::Execute" + ErrorMsg() << "WOKOrbix_ExtractServerList::Execute" << "Cannot determine idl interface name in " << fullname << ": underscore is missing" << endm; } @@ -124,7 +124,7 @@ void WOKOrbix_ExtractServerList::Execute(const Handle(WOKMake_HSequenceOfInputFi if(declarfile.IsNull()) { - ErrorMsg << "WOKOrbix_ExtractServerList::Execute" + ErrorMsg() << "WOKOrbix_ExtractServerList::Execute" << "Could not find IDL unit interface declaration list file : " << idlunit << ":" << admtype << ":" << declfilename << endm; SetFailed(); @@ -145,7 +145,7 @@ void WOKOrbix_ExtractServerList::Execute(const Handle(WOKMake_HSequenceOfInputFi if(!amap.IsBound(fullname)) { - ErrorMsg << "WOKOrbix_ExtractServerList::Execute" + ErrorMsg() << "WOKOrbix_ExtractServerList::Execute" << "IDL unit " << idlunit << " does not declare interface: " << interfacename << endm; SetFailed(); } @@ -181,7 +181,7 @@ void WOKOrbix_ExtractServerList::Execute(const Handle(WOKMake_HSequenceOfInputFi if(servobj.IsNull()) { - ErrorMsg << "WOKOrbix_ExtractServerList::Execute" + ErrorMsg() << "WOKOrbix_ExtractServerList::Execute" << "Could not find objfile: " << WOKernel_File::FileLocatorName(idlunit, objtype, filename[j]); SetFailed(); } diff --git a/src/WOKOrbix/WOKOrbix_IDLCompile.cxx b/src/WOKOrbix/WOKOrbix_IDLCompile.cxx index 587a5e6..e59ef9e 100755 --- a/src/WOKOrbix/WOKOrbix_IDLCompile.cxx +++ b/src/WOKOrbix/WOKOrbix_IDLCompile.cxx @@ -110,7 +110,7 @@ void WOKOrbix_IDLCompile::Init() if(myiterator.LoadGroup()) { - ErrorMsg << "WOKOrbix_IDLCompile::Init" + ErrorMsg() << "WOKOrbix_IDLCompile::Init" << "Could not load idl compilers definition" << endm; SetFailed(); return; @@ -190,11 +190,11 @@ _TEST_BREAK(); if(infile->File()->Nesting()->IsSameString(Unit()->FullName())) { - InfoMsg << "WOKOrbix_IDLCompile::Execute" << "-------> " << infile->File()->Name() << endm; + InfoMsg() << "WOKOrbix_IDLCompile::Execute" << "-------> " << infile->File()->Name() << endm; } else { - InfoMsg << "WOKOrbix_IDLCompile::Execute" << "-------> " << infile->File()->UserPathName() << endm; + InfoMsg() << "WOKOrbix_IDLCompile::Execute" << "-------> " << infile->File()->UserPathName() << endm; } switch(myiterator.Execute(anidlfile)) @@ -202,13 +202,13 @@ _TEST_BREAK(); case WOKBuilder_Success: { WOK_TRACE { - if(VerboseMsg("WOK_ORBIX").IsSet()) + if(VerboseMsg()("WOK_ORBIX").IsSet()) { - VerboseMsg << "WOKOrbix_IDLCompile::Execute" + VerboseMsg() << "WOKOrbix_IDLCompile::Execute" << anidlfile->Path()->Name() << " produces : " << endm; for(i=1; i<=myiterator.Produces()->Length(); i++) { - VerboseMsg << "WOKOrbix_IDLCompile::Execute" + VerboseMsg() << "WOKOrbix_IDLCompile::Execute" << "\t\t" << myiterator.Produces()->Value(i)->Path()->Name() << endm; } } @@ -221,7 +221,7 @@ _TEST_BREAK(); break; case WOKBuilder_Failed: fails->Append(infile); - ErrorMsg << "WOKOrbix_IDLCompile::Execute" << "Failed : " << infile->File()->Name() << endm; + ErrorMsg() << "WOKOrbix_IDLCompile::Execute" << "Failed : " << infile->File()->Name() << endm; break; default: break; } @@ -237,15 +237,15 @@ _TEST_BREAK(); if(fails->Length()) { - InfoMsg << "WOKOrbix_IDLCompile::Execute" + InfoMsg() << "WOKOrbix_IDLCompile::Execute" << "----------------------- IDL Compilation Report -----------------------" << endm; for(i=1; i<= fails->Length(); i++) { - InfoMsg << "WOKOrbix_IDLCompile::Execute" + InfoMsg() << "WOKOrbix_IDLCompile::Execute" << "Failed : " << fails->Value(i)->File()->UserPathName() << endm; } - InfoMsg << "WOKOrbix_IDLCompile::Execute" + InfoMsg() << "WOKOrbix_IDLCompile::Execute" << "-----------------------------------------------------------------" << endm; } diff --git a/src/WOKOrbix/WOKOrbix_IDLCompiler.cxx b/src/WOKOrbix/WOKOrbix_IDLCompiler.cxx index a67fe4a..74a0ceb 100755 --- a/src/WOKOrbix/WOKOrbix_IDLCompiler.cxx +++ b/src/WOKOrbix/WOKOrbix_IDLCompiler.cxx @@ -114,8 +114,8 @@ WOKBuilder_BuildStatus WOKOrbix_IDLCompiler::Execute() astr = EvalToolTemplate(Template()->ToCString()); WOK_TRACE { - VerboseMsg("WOK_ORBIX") << "WOKOrbix_IDLCompiler::Execute" << "Compilation line : " << endm; - VerboseMsg("WOK_ORBIX") << "WOKOrbix_IDLCompiler::Execute" << astr << endm; + VerboseMsg()("WOK_ORBIX") << "WOKOrbix_IDLCompiler::Execute" << "Compilation line : " << endm; + VerboseMsg()("WOK_ORBIX") << "WOKOrbix_IDLCompiler::Execute" << astr << endm; } Shell()->ClearOutput(); @@ -125,26 +125,26 @@ WOKBuilder_BuildStatus WOKOrbix_IDLCompiler::Execute() if(Shell()->Status()) { - Standard_Boolean ph = ErrorMsg.PrintHeader(); + Standard_Boolean ph = ErrorMsg().PrintHeader(); - ErrorMsg << "WOKOrbix_IDLCompiler::Execute" << "Errors occured in Shell" << endm; - ErrorMsg.DontPrintHeader(); + ErrorMsg() << "WOKOrbix_IDLCompiler::Execute" << "Errors occured in Shell" << endm; + ErrorMsg().DontPrintHeader(); for(Standard_Integer i=start; i<= resseq->Length(); i++) { - ErrorMsg << "WOKOrbix_IDLCompiler::Execute" << resseq->Value(i) << endm; + ErrorMsg() << "WOKOrbix_IDLCompiler::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=start; i<= resseq->Length(); i++) { - InfoMsg << "WOKOrbix_IDLCompiler::Execute" << resseq->Value(i) << endm; + InfoMsg() << "WOKOrbix_IDLCompiler::Execute" << resseq->Value(i) << endm; } - if(ph) InfoMsg.DoPrintHeader(); + if(ph) InfoMsg().DoPrintHeader(); } Shell()->ClearOutput(); diff --git a/src/WOKOrbix/WOKOrbix_IDLCompilerIterator.cxx b/src/WOKOrbix/WOKOrbix_IDLCompilerIterator.cxx index d7814ba..9a45480 100755 --- a/src/WOKOrbix/WOKOrbix_IDLCompilerIterator.cxx +++ b/src/WOKOrbix/WOKOrbix_IDLCompilerIterator.cxx @@ -75,12 +75,12 @@ void WOKOrbix_IDLCompilerIterator::Init(const Handle(WOKUtils_Shell)& ashell, if(optline.IsNull()) { - ErrorMsg << "WOKOrbix_IDLCompilerIterator::Init" + ErrorMsg() << "WOKOrbix_IDLCompilerIterator::Init" << "Could not eval compiler " << acompiler->Name() << " options" << endm; return; } - InfoMsg << "WOKOrbix_IDLCompilerIterator::Init" << optline << endm; + InfoMsg() << "WOKOrbix_IDLCompilerIterator::Init" << optline << endm; } } } @@ -112,7 +112,7 @@ WOKBuilder_BuildStatus WOKOrbix_IDLCompilerIterator::Execute(const Handle(WOKOrb if(acompiler.IsNull()) { - ErrorMsg << "WOKOrbix_IDLCompilerIterator::Execute" + ErrorMsg() << "WOKOrbix_IDLCompilerIterator::Execute" << "Could not find appropriate Compiler for " << anidlfile->Path()->Name() << endm; return WOKBuilder_Failed; } diff --git a/src/WOKOrbix/WOKOrbix_IDLFill.cxx b/src/WOKOrbix/WOKOrbix_IDLFill.cxx index 850eb02..2edfe0b 100755 --- a/src/WOKOrbix/WOKOrbix_IDLFill.cxx +++ b/src/WOKOrbix/WOKOrbix_IDLFill.cxx @@ -106,7 +106,7 @@ void WOKOrbix_IDLFill::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execl if(idlfile.IsNull()) { - ErrorMsg << "WOKOrbix_IDLFill::Execute" + ErrorMsg() << "WOKOrbix_IDLFill::Execute" << "Invalid input : " << infile->BuilderEntity()->Path()->Name() << endm; SetFailed(); return; @@ -114,11 +114,11 @@ void WOKOrbix_IDLFill::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execl if(infile->File()->Nesting()->IsSameString(Unit()->FullName())) { - InfoMsg << "WOKOrbix_IDLFill::Execute" << "-------> " << infile->File()->Name() << endm; + InfoMsg() << "WOKOrbix_IDLFill::Execute" << "-------> " << infile->File()->Name() << endm; } else { - InfoMsg << "WOKOrbix_IDLFill::Execute" << "-------> " << infile->File()->UserPathName() << endm; + InfoMsg() << "WOKOrbix_IDLFill::Execute" << "-------> " << infile->File()->UserPathName() << endm; } switch(atrans->Execute(idlfile)) diff --git a/src/WOKOrbix/WOKOrbix_IDLSourceExtract.cxx b/src/WOKOrbix/WOKOrbix_IDLSourceExtract.cxx index 900f2d3..c802b9c 100755 --- a/src/WOKOrbix/WOKOrbix_IDLSourceExtract.cxx +++ b/src/WOKOrbix/WOKOrbix_IDLSourceExtract.cxx @@ -91,7 +91,7 @@ void WOKOrbix_IDLSourceExtract::Execute(const Handle(WOKMake_HSequenceOfInputFil if(srcfile.IsNull()) { - WarningMsg << "WOKOrbix_IDLSourceExtract::Execute" + WarningMsg() << "WOKOrbix_IDLSourceExtract::Execute" << "Extraction deducted source file " << filename << " is missing" << endm; srcfile = new WOKernel_File(filename, Unit(), Unit()->GetFileType(srctype)); srcfile->GetPath(); @@ -106,7 +106,7 @@ void WOKOrbix_IDLSourceExtract::Execute(const Handle(WOKMake_HSequenceOfInputFil } else { - ErrorMsg << "WOKOrbix_IDLSourceExtract::Execute" + ErrorMsg() << "WOKOrbix_IDLSourceExtract::Execute" << "Invalid extension for " << filename << " should be .template" << endm; SetFailed(); } diff --git a/src/WOKOrbix/WOKOrbix_IDLTranslator.cxx b/src/WOKOrbix/WOKOrbix_IDLTranslator.cxx index 5bc9f7d..ac75a53 100755 --- a/src/WOKOrbix/WOKOrbix_IDLTranslator.cxx +++ b/src/WOKOrbix/WOKOrbix_IDLTranslator.cxx @@ -40,7 +40,7 @@ void WOKOrbix_IDLTranslator::Load() if(astr.IsNull()) { - ErrorMsg << "WOKOrbix_IDLTranslator::Load" + ErrorMsg() << "WOKOrbix_IDLTranslator::Load" << "Invalid SHARED parameter for tool: " << Name() << endm; return; } @@ -55,7 +55,7 @@ void WOKOrbix_IDLTranslator::Load() if(libpath.IsNull()) { - ErrorMsg << "WOKOrbix_IDLTranslator::Load" + ErrorMsg() << "WOKOrbix_IDLTranslator::Load" << "Could not find file : " << Shared() << endm; return; } @@ -65,7 +65,7 @@ void WOKOrbix_IDLTranslator::Load() if(name.IsNull()) { - ErrorMsg << "WOKOrbix_IDLTranslator::Load" << "Could not eval NAME for IDLTranslator" << endm; + ErrorMsg() << "WOKOrbix_IDLTranslator::Load" << "Could not eval NAME for IDLTranslator" << endm; return; } @@ -87,7 +87,7 @@ WOKBuilder_BuildStatus WOKOrbix_IDLTranslator::Translate(const Handle(WOKOrbix_I { if(mytranslator == NULL) { - ErrorMsg << "WOKOrbix_IDLTranslator::Translate" << "Null Translator : Cannot Perform" << endm; + ErrorMsg() << "WOKOrbix_IDLTranslator::Translate" << "Null Translator : Cannot Perform" << endm; return WOKBuilder_Failed; } @@ -98,7 +98,7 @@ WOKBuilder_BuildStatus WOKOrbix_IDLTranslator::Translate(const Handle(WOKOrbix_I if((*mytranslator)(MSchema()->MetaSchema(),afile->Path()->Name(),globlist,inctypes,insttypes,gentypes)) { - ErrorMsg << "WOKOrbix_IDLTranslator::Translate" << "Errors occured" << endm; + ErrorMsg() << "WOKOrbix_IDLTranslator::Translate" << "Errors occured" << endm; return WOKBuilder_Failed; } return WOKBuilder_Success; diff --git a/src/WOKOrbix/WOKOrbix_ServerSource.cxx b/src/WOKOrbix/WOKOrbix_ServerSource.cxx index ef0d22e..6693e1c 100755 --- a/src/WOKOrbix/WOKOrbix_ServerSource.cxx +++ b/src/WOKOrbix/WOKOrbix_ServerSource.cxx @@ -149,7 +149,7 @@ void WOKOrbix_ServerSource::Execute(const Handle(WOKMake_HSequenceOfInputFile)& if(afile.IsNull()) { - WarningMsg << "WOKOrbix_ServerSource::Execute" + WarningMsg() << "WOKOrbix_ServerSource::Execute" << "Missing server main file " << astr << endm; afile = new WOKernel_File(astr, Unit(), Unit()->GetFileType(asourcetype)); afile->GetPath();