]> OCCT Git - occt-wok.git/commitdiff
OCC20850 umake command do not work on SunOS10
authorcascade <cascade@opencascade.com>
Fri, 13 Feb 2009 18:33:58 +0000 (18:33 +0000)
committercascade <cascade@opencascade.com>
Fri, 13 Feb 2009 18:33:58 +0000 (18:33 +0000)
32 files changed:
src/WOKStep/WOKStep_ArchiveLibrary.cxx
src/WOKStep/WOKStep_CDLUnitSource.cxx
src/WOKStep/WOKStep_ClientExtract.cxx
src/WOKStep/WOKStep_CodeGenerate.cxx
src/WOKStep/WOKStep_Compile.cxx
src/WOKStep/WOKStep_ComputeLinkList.cxx
src/WOKStep/WOKStep_DLLink.cxx
src/WOKStep/WOKStep_DynamicLibrary.cxx
src/WOKStep/WOKStep_EngDatFiles.cxx
src/WOKStep/WOKStep_EngLDFile.cxx
src/WOKStep/WOKStep_EngLinkList.cxx
src/WOKStep/WOKStep_Extract.cxx
src/WOKStep/WOKStep_ExtractExecList.cxx
src/WOKStep/WOKStep_HeaderExtract.cxx
src/WOKStep/WOKStep_ImplementationDep.cxx
src/WOKStep/WOKStep_Include.cxx
src/WOKStep/WOKStep_JiniExtract.cxx
src/WOKStep/WOKStep_LibExtract.cxx
src/WOKStep/WOKStep_LibLimit.cxx
src/WOKStep/WOKStep_LibUnCompress.cxx
src/WOKStep/WOKStep_Link.cxx
src/WOKStep/WOKStep_LinkList.cxx
src/WOKStep/WOKStep_MSFill.cxx
src/WOKStep/WOKStep_ProcessStep.cxx
src/WOKStep/WOKStep_ResourceSource.cxx
src/WOKStep/WOKStep_Source.cxx
src/WOKStep/WOKStep_SourceExtract.cxx
src/WOKStep/WOKStep_TKList.cxx
src/WOKStep/WOKStep_TKReplace.cxx
src/WOKStep/WOKStep_WNTK.cxx
src/WOKStep/WOKStep_WNTLibrary.cxx
src/WOKStep/WOKStep_WNTLink.cxx

index aaa89450ee5a695fe1cf215a3a7849687bd6e05a..138c1473557ab80fe95a3ac2b0bce81923229264 100755 (executable)
@@ -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;
index 73be607d1be67bcad52c0d717cecec1fd1fff712..13bdf04e191281c47e8d91c3579a0bf4a7faf252 100755 (executable)
@@ -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;
     }
   }
index dd9b1f19364f3c70b689ec947680b9e50f830326..f5af39118a78d0bda270e508ee45465e3d2cb4dc 100755 (executable)
@@ -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;
        }
index d0523e2e3325e575217071e616eb4086f3a318bc..2d59ab65f18acacb76540cd823f47fccc6ad9aae 100755 (executable)
@@ -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;
     }
 
index b2d7630d2a7b6b979cbb3ca4cf1a993704f0cd71..b0d0146018967e5c42c22d2b2c7ce66c5cefeb72 100755 (executable)
@@ -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;
 
index 5aed06465f61e84bc45bb1f70950557f3be77ad1..74d24274c0a9549557a1ed079c85e01f3ae4904c 100755 (executable)
@@ -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;
index b9779fe439c74751e0f0b8d82572d1bb1c63466f..d3f4a67b52b11946fc3857bfe0aaf27a27a51a79 100755 (executable)
@@ -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;
index 09097de4836c682a6f42137e912a5238773f7e2e..86a00b0e8fe59183c0df1d7a74cdd708de469503 100755 (executable)
@@ -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;
index 146ce9c731856b7bec0d49ed1d8b355d65440091..1bf54376fdec9e38abb5600e1c333a5d311e5a07 100755 (executable)
@@ -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;
index 8575026906bc9b6423808b1a2c287cd40ed7c26d..a67585939ee7bdc8ce633ee371a201a6b1c62528 100755 (executable)
@@ -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;
index bdc1e3c8ee5b815f3c414fff609ba841397cb27d..19826d933a8e5b2fa24058e1bdef6abf8266b1c2 100755 (executable)
@@ -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();
     }
index 262699657064d84cbcf492349e13e4f8283ba47b..377540bcf24a398fda06829410ab6c3ff6129240 100755 (executable)
@@ -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;
        }
index 0019a124d8344f5ba3724ea66e9108d04717388e..aa653b3d847dff4ef9301da1b3a075632dc15db4 100755 (executable)
@@ -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;
                         }
index 95cce548cc08ace5e51b378cfd5c5614d1aa4d45..a2b15d94a0e6218560dfa17befb9706d351a907d 100755 (executable)
@@ -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;
index 155d461265863502a261824968dd73c32f20e3ae..b86e04c518a50f443412089be075438c6d2446f4 100755 (executable)
@@ -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;
index c7ac9ee5a744f9cbb81caf21d828c815ba3ed07a..48e6fa22dea787b618eb0f43389faf3f629af086 100755 (executable)
@@ -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;
index 6d64af898ac06ff70193c1f0c9353d4a3516216d..a321ce13f6d3cf698d2556f9269101921f33637a 100755 (executable)
@@ -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
index 27add3347fdff6cf9dd8a981edfde33e26b33f72..b0b555337282ba5f87447cbc844fab835e2735f2 100755 (executable)
@@ -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;
                      }
index 08abdb4d7fac1fa0f41cdb68e7133045d8336740..dcbfa0aff8f01fc1494b0e7e3fa838b0d45f26e8 100755 (executable)
@@ -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++)
            {
index 8a0cfae325dc8651a4b76c3d6e70d9e43b7db886..b80a714322b7245151e8e72ee78a86d513fc62da 100755 (executable)
@@ -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()))
index bf2f994e26557a7204cf77844cef00801cc4bd06..49111b35dfa74141958affad05c304abaa826bd8 100755 (executable)
@@ -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;
index 9b61f29f1bb57210713135f3d2ecc432d8bbfcd9..2cb480c7540cba9c7a39f0d7cc59fc8a1ee2cabe 100755 (executable)
@@ -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++;
index 3656548c8686654158c4adac5120f832636f08a0..2f9385edc7096ca3b57bde6dbbec0c10fd724660 100755 (executable)
@@ -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;
                    }
index 30e6a56318d65056946a051b5a9f62cd26851b1b..2fd3e525354433ef6b6f895d8e1e64c56b082169 100755 (executable)
@@ -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())
index ac463d6c8a2c334c7ce7fc16834fdef3a42c406a..f8d846cf58a9b643ab74883938c2da01c9039f98 100755 (executable)
@@ -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();
                    }
index a3cc50ef17f0d4c60f6017c6444a98c7848359f9..6ec658aab70d5aac8ad82d923f530bb91de8765a 100755 (executable)
@@ -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;
index e811043a89951d454f9c7d7fe2f830a41df21b73..5e0e27d2bc7a6ff9a82ed3c2e42b4b497080cf4c 100755 (executable)
@@ -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();
index 2eed46061214083b479902e0efbb0aa4e8e29a3f..6b5256cf5529623c6c4bc59ca0fee0e53ea8c812 100755 (executable)
@@ -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;
index 17f43eb0ce8815541d2d9e21bff13bde1b1dce26..24abed3d8b37d2f523ba874b3bc7409a35b4d62a 100755 (executable)
@@ -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;
                }
index 6f063801f8c8944b5e56b0ad0ebafb3615f00929..bb6802b7dd888ef421ec79d26afbd982114e6fa4 100755 (executable)
@@ -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;
index 20c0ddbb7b293e48272a2e533660d6e2a453d5bf..63a4ae510ec9c031b0f27d7f44955128905fa0ff 100755 (executable)
@@ -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;
        
index 0a572b1aa337da466e21776a01ce73ced3af9cec..42c970b72682d017515359586734e4f567bb592a 100755 (executable)
@@ -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