From: cas Date: Fri, 5 Nov 1999 18:28:10 +0000 (+0000) Subject: No comments X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=97dd7aa54e7919688ca042e2c28d727bba231d82;p=occt-wok.git No comments --- diff --git a/src/WOKStep/FILES b/src/WOKStep/FILES index 36074c3..65bf21c 100755 --- a/src/WOKStep/FILES +++ b/src/WOKStep/FILES @@ -1,3 +1,5 @@ WOKStep_ccl.tcl WOKStep_frontal.tcl WOKStep_TclLibIdep.tcl +WOKStep_JavaCompile.tcl +WOKStep_JavaHeader.tcl diff --git a/src/WOKStep/WOKStep.cdl b/src/WOKStep/WOKStep.cdl index f4f2455..8ec0396 100755 --- a/src/WOKStep/WOKStep.cdl +++ b/src/WOKStep/WOKStep.cdl @@ -39,6 +39,7 @@ is class ServerExtract; class ClientExtract; class EngineExtract; + class JiniExtract; class ExtractExecList; diff --git a/src/WOKStep/WOKStep_ArchiveLibrary.cxx b/src/WOKStep/WOKStep_ArchiveLibrary.cxx index a0b5274..aaa8945 100755 --- a/src/WOKStep/WOKStep_ArchiveLibrary.cxx +++ b/src/WOKStep/WOKStep_ArchiveLibrary.cxx @@ -175,6 +175,7 @@ void WOKStep_ArchiveLibrary::Execute(const Handle(WOKMake_HSequenceOfInputFile)& << "Failed : lib" << ar->TargetName() << ".a" << endm; SetFailed(); break; + default: break; } ashell->NoLog(); ashell->UnLock(); diff --git a/src/WOKStep/WOKStep_ClientExtract.cxx b/src/WOKStep/WOKStep_ClientExtract.cxx index d3ceff4..9d9e226 100755 --- a/src/WOKStep/WOKStep_ClientExtract.cxx +++ b/src/WOKStep/WOKStep_ClientExtract.cxx @@ -218,7 +218,8 @@ Handle(WOKMake_HSequenceOfInputFile) WOKStep_ClientExtract::OutOfDateEntities() case WOKBuilder_NotDefined: SetFailed(); return result; - } + default: break; + } } return result; } @@ -314,6 +315,7 @@ void WOKStep_ClientExtract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& outfile = new WOKernel_File(outent->Path()->FileName(), Unit(), sourcetype); istemplate = Standard_True; break; + default: break; } outfile->GetPath(); @@ -371,6 +373,7 @@ void WOKStep_ClientExtract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& case WOKBuilder_Failed: 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 0b6819e..d0523e2 100755 --- a/src/WOKStep/WOKStep_CodeGenerate.cxx +++ b/src/WOKStep/WOKStep_CodeGenerate.cxx @@ -236,6 +236,7 @@ void WOKStep_CodeGenerate::Execute(const Handle(WOKMake_HSequenceOfInputFile)& e fails->Append(infile); ErrorMsg << "WOKStep_CodeGenerate::Execute" << "Failed : " << infile->File()->Name() << endm; break; + default: break; } } diff --git a/src/WOKStep/WOKStep_Compile.cxx b/src/WOKStep/WOKStep_Compile.cxx index 88d3f1e..9603a10 100755 --- a/src/WOKStep/WOKStep_Compile.cxx +++ b/src/WOKStep/WOKStep_Compile.cxx @@ -273,6 +273,7 @@ _TEST_BREAK(); fails->Append(infile); ErrorMsg << "WOKStep_Compile::Execute" << "Failed : " << infile->File()->Name() << endm; break; + default: break; } } diff --git a/src/WOKStep/WOKStep_DynamicLibrary.cxx b/src/WOKStep/WOKStep_DynamicLibrary.cxx index 6333db3..5520314 100755 --- a/src/WOKStep/WOKStep_DynamicLibrary.cxx +++ b/src/WOKStep/WOKStep_DynamicLibrary.cxx @@ -242,6 +242,7 @@ void WOKStep_DynamicLibrary::Execute(const Handle(WOKMake_HSequenceOfInputFile)& << "Failed : " << libname << endm; SetFailed(); break; + default: break; } ashell->UnLock(); diff --git a/src/WOKStep/WOKStep_ExecLink.cxx b/src/WOKStep/WOKStep_ExecLink.cxx index 824c6af..c0213f5 100755 --- a/src/WOKStep/WOKStep_ExecLink.cxx +++ b/src/WOKStep/WOKStep_ExecLink.cxx @@ -113,6 +113,7 @@ void WOKStep_ExecLink::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execl case WOKMake_Failed: case WOKMake_Unprocessed: break; + default: break; } SetStatus(status); return; diff --git a/src/WOKStep/WOKStep_Extract.cxx b/src/WOKStep/WOKStep_Extract.cxx index 0bb2465..2626996 100755 --- a/src/WOKStep/WOKStep_Extract.cxx +++ b/src/WOKStep/WOKStep_Extract.cxx @@ -198,6 +198,7 @@ void WOKStep_Extract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& tobuil outfile = new WOKernel_File(outent->Path()->FileName(), Unit(), sourcetype); istemplate = Standard_True; break; + default: break; } outfile->GetPath(); @@ -262,6 +263,7 @@ void WOKStep_Extract::Execute(const Handle(WOKMake_HSequenceOfInputFile)& tobuil 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 5ec2fed..968bb15 100755 --- a/src/WOKStep/WOKStep_ExtractExecList.cxx +++ b/src/WOKStep/WOKStep_ExtractExecList.cxx @@ -159,6 +159,7 @@ _TEST_BREAK(); << "========> " << astep->SubCode() << " is still unprocessed" << endm; ok=Standard_False; break; + default: break; } AddExecDepItem(infile,outfile, Standard_True); diff --git a/src/WOKStep/WOKStep_HeaderExtract.cxx b/src/WOKStep/WOKStep_HeaderExtract.cxx index 8033435..95cce54 100755 --- a/src/WOKStep/WOKStep_HeaderExtract.cxx +++ b/src/WOKStep/WOKStep_HeaderExtract.cxx @@ -82,6 +82,7 @@ _TEST_BREAK(); case WOKBuilder_NotDefined: SetFailed(); return result; + default: break; } } return result; diff --git a/src/WOKStep/WOKStep_ImplementationDep.cxx b/src/WOKStep/WOKStep_ImplementationDep.cxx index af455d1..ad1c4c2 100755 --- a/src/WOKStep/WOKStep_ImplementationDep.cxx +++ b/src/WOKStep/WOKStep_ImplementationDep.cxx @@ -198,8 +198,6 @@ void WOKStep_ImplementationDep::Execute(const Handle(WOKMake_HSequenceOfInputFil outidep->SetLocateFlag(Standard_True); - WOKTools_MapOfHAsciiString& knownunits = BuildProcess()->KnownUnits(); - if(InternFile.IsNull() && InFiles->Length()) { for(Standard_Integer i=1; i<=InFiles->Length(); i++) diff --git a/src/WOKStep/WOKStep_LibLimit.cxx b/src/WOKStep/WOKStep_LibLimit.cxx index 135ecba..2f08e40 100755 --- a/src/WOKStep/WOKStep_LibLimit.cxx +++ b/src/WOKStep/WOKStep_LibLimit.cxx @@ -257,6 +257,7 @@ void WOKStep_LibLimit::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execl << "========> " << astep->SubCode() << " is still unprocessed" << endm; ok=Standard_False; break; + default: break; } Handle(TCollection_HAsciiString) Theid = WOKMake_Step::StepOutputID(Unit()->Name(), astep->Code(), diff --git a/src/WOKStep/WOKStep_LibLink.cxx b/src/WOKStep/WOKStep_LibLink.cxx index 693eb8b..178e3ed 100755 --- a/src/WOKStep/WOKStep_LibLink.cxx +++ b/src/WOKStep/WOKStep_LibLink.cxx @@ -127,6 +127,7 @@ void WOKStep_LibLink::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execli case WOKMake_Failed: case WOKMake_Unprocessed: break; + default: break; } SetStatus(status); diff --git a/src/WOKStep/WOKStep_Link.cxx b/src/WOKStep/WOKStep_Link.cxx index 1ec4e1d..5ba1b73 100755 --- a/src/WOKStep/WOKStep_Link.cxx +++ b/src/WOKStep/WOKStep_Link.cxx @@ -494,6 +494,7 @@ WOKMake_Status WOKStep_Link::ExecuteLink(Handle(WOKMake_HSequenceOfOutputFile)& ErrorMsg << "WOKStep_Link::ExecuteLink" << "Failed : " << mytarget << endm; SetFailed(); break; + default: break; } ashell->UnsetEcho(); diff --git a/src/WOKStep/WOKStep_LinkList.cxx b/src/WOKStep/WOKStep_LinkList.cxx index 7740278..d3e9613 100755 --- a/src/WOKStep/WOKStep_LinkList.cxx +++ b/src/WOKStep/WOKStep_LinkList.cxx @@ -148,7 +148,7 @@ Handle(WOKMake_OutputFile) WOKStep_LinkList::GetUnitLibrary(const Handle(WOKerne Handle(WOKMake_OutputFile) alib; Handle(WOKernel_File) afile; Handle(WOKernel_UnitNesting) anesting; - WOKBuilder_LibReferenceType reftype; + WOKBuilder_LibReferenceType reftype = WOKBuilder_FullPath; static Handle(TCollection_HAsciiString) libtype = new TCollection_HAsciiString("library"); Handle(TCollection_HAsciiString) libname; @@ -156,7 +156,6 @@ Handle(WOKMake_OutputFile) WOKStep_LinkList::GetUnitLibrary(const Handle(WOKerne if(anesting->IsKind(STANDARD_TYPE(WOKernel_Workbench))) { - reftype = WOKBuilder_FullPath; } else { diff --git a/src/WOKStep/WOKStep_MSFill.cxx b/src/WOKStep/WOKStep_MSFill.cxx index c682e45..7c3dea7 100755 --- a/src/WOKStep/WOKStep_MSFill.cxx +++ b/src/WOKStep/WOKStep_MSFill.cxx @@ -232,6 +232,11 @@ void WOKStep_MSFill::Execute(const Handle(WOKMake_HSequenceOfInputFile)& ) { anit.AddInStack(Unit()->Name(), WOKBuilder_Engine); } + else if (Unit()->TypeCode() == 'j') + { + anit.AddInStack(Unit()->Name(), WOKBuilder_Client); + } + while(anit.More() && !stop) diff --git a/src/WOKStep/WOKStep_ProcessStep.cxx b/src/WOKStep/WOKStep_ProcessStep.cxx index bfe7181..4360595 100755 --- a/src/WOKStep/WOKStep_ProcessStep.cxx +++ b/src/WOKStep/WOKStep_ProcessStep.cxx @@ -51,6 +51,8 @@ #include +#include + #define READBUF_SIZE 1024 #ifndef WNT @@ -166,7 +168,7 @@ Handle(TCollection_HAsciiString) WOKStep_ProcessStep::GetUnitName(const Handle(T { break; } - *ptr++; + ++ptr; } *unitptr = '\0'; @@ -461,6 +463,48 @@ Handle(WOKUtils_HSequenceOfPath) WOKStep_ProcessStep::ComputeIncDirectories() co } } + DOT = Unit () -> Params ().Eval ( "%FILENAME_FILES" ); + aname = new TCollection_HAsciiString ( "source" ); + afile = Locator () -> Locate ( Unit () -> Name (), aname, DOT ); + + if ( !afile.IsNull () ) { + + WOKUtils_AdmFile afiles ( afile -> Path () ); + Handle( TCollection_HAsciiString ) p = new TCollection_HAsciiString ( "privinclude" ); + Handle( TColStd_HSequenceOfHAsciiString ) s; + + s = afiles.Read (); + + if ( !s.IsNull () ) + + for ( i = 1; i <= s -> Length (); ++i ) { + + Standard_Integer j; + + DOT = s -> Value ( i ); + + DOT -> LeftAdjust (); + DOT -> RightAdjust (); + + if ( ( j = DOT -> Search ( ":" ) ) != -1 ) { + + aname = DOT -> SubString ( 1, j - 1 ); + + afile = Locator () -> Locate ( aname, p, new TCollection_HAsciiString ( "" ) ); + + if ( !afile.IsNull () && !amap.Contains ( afile->Path () -> Name () ) ) { + + aseq -> Append ( afile -> Path () ); + amap.Add( afile -> Path () -> Name () ); + + } // end if + + } // end if + + } // end for + + } // end if + return aseq; } diff --git a/src/WOKStep/WOKStep_Source.cxx b/src/WOKStep/WOKStep_Source.cxx index a9b4ba8..a3cc50e 100755 --- a/src/WOKStep/WOKStep_Source.cxx +++ b/src/WOKStep/WOKStep_Source.cxx @@ -133,8 +133,12 @@ _TEST_BREAK(); astr->LeftAdjust(); astr->RightAdjust(); - - afile = Locator()->Locate(Unit()->Name(), sourcetype, astr); + + if ( astr -> Search ( ":" ) != -1 ) { + + afile = Locator () -> Locate ( astr ); + + } else afile = Locator()->Locate(Unit()->Name(), sourcetype, astr); if(afile.IsNull() == Standard_True) { diff --git a/src/WOKStep/WOKStep_TKReplace.cxx b/src/WOKStep/WOKStep_TKReplace.cxx index dfcb19c..b983d41 100755 --- a/src/WOKStep/WOKStep_TKReplace.cxx +++ b/src/WOKStep/WOKStep_TKReplace.cxx @@ -404,8 +404,6 @@ Handle(WOKMake_OutputFile) WOKStep_TKReplace::SubstituteInput(const Handle(WOKMa Handle(TCollection_HAsciiString) current = TheUnit->Name(); - Standard_Integer udidx = myuds.FindIndex(current); - mytreated.Add(current); Handle(TCollection_HAsciiString) curtk = GetTKForUnit(current); diff --git a/src/WOKStep/WOKStep_TclLibIdep.tcl b/src/WOKStep/WOKStep_TclLibIdep.tcl index faa34a0..2d8e39c 100755 --- a/src/WOKStep/WOKStep_TclLibIdep.tcl +++ b/src/WOKStep/WOKStep_TclLibIdep.tcl @@ -1,16 +1,16 @@ -proc WOKStep_TclLibIdep::AdmFileType {} { +proc WOKStep_TclLibIdep:AdmFileType {} { return "stadmfile"; } -proc WOKStep_TclLibIdep::OutputDirTypeName {} { +proc WOKStep_TclLibIdep:OutputDirTypeName {} { return "sttmpfile"; } -proc WOKStep_TclLibIdep::HandleInputFile { ID } { +proc WOKStep_TclLibIdep:HandleInputFile { ID } { scan $ID "%\[^:\]:%\[^:\]:%\[^:\]" unit type name if {$name == "PACKAGES"} { @@ -20,9 +20,9 @@ proc WOKStep_TclLibIdep::HandleInputFile { ID } { return 0 } -proc WOKStep_TclLibIdep::Execute { unit args } { +proc WOKStep_TclLibIdep:Execute { unit args } { - msgprint -i -c "WOKStep_TclLibIdep::Execute" "Build ImplDep" + msgprint -i -c "WOKStep_TclLibIdep:Execute" "Build ImplDep" set unitname [wokinfo -n $unit] @@ -31,7 +31,7 @@ proc WOKStep_TclLibIdep::Execute { unit args } { set packfile [woklocate -p $file $unit] if {[clength $packfile] == 0} { - msgprint -e -c "WOKStep_TclLibIdep::Execute" "Could not locate PACKAGES for unit $unit" + msgprint -e -c "WOKStep_TclLibIdep:Execute" "Could not locate PACKAGES for unit $unit" return 1; } else { for_file anud $packfile { diff --git a/src/WOKStep/WOKStep_ToolkitSource.cxx b/src/WOKStep/WOKStep_ToolkitSource.cxx index a711d6b..7aad750 100755 --- a/src/WOKStep/WOKStep_ToolkitSource.cxx +++ b/src/WOKStep/WOKStep_ToolkitSource.cxx @@ -62,7 +62,6 @@ void WOKStep_ToolkitSource::AddPACKAGES(const Handle(WOKMake_InputFile)& PACKAGE { Handle(WOKernel_File) afile; Handle(TCollection_HAsciiString) sourcetype = new TCollection_HAsciiString("source"); - Standard_Integer i; // le fichier PACKAGES WOKUtils_Param params = Unit()->Params(); diff --git a/src/WOKStep/WOKStep_WNTLibrary.cxx b/src/WOKStep/WOKStep_WNTLibrary.cxx index 3056510..da73b95 100755 --- a/src/WOKStep/WOKStep_WNTLibrary.cxx +++ b/src/WOKStep/WOKStep_WNTLibrary.cxx @@ -147,6 +147,7 @@ void WOKStep_WNTLibrary::Execute (const Handle(WOKMake_HSequenceOfInputFile)& an case WOKBuilder_Failed: SetFailed(); break; + default: break; } } diff --git a/src/WOKStep/WOKStep_ccl.tcl b/src/WOKStep/WOKStep_ccl.tcl index 7f80dd9..8f89ff0 100755 --- a/src/WOKStep/WOKStep_ccl.tcl +++ b/src/WOKStep/WOKStep_ccl.tcl @@ -1,14 +1,14 @@ -proc WOKStep_ccl::AdmFileType {} { +proc WOKStep_ccl:AdmFileType {} { return admfile; } -proc WOKStep_ccl::OutputDirTypeName {} { +proc WOKStep_ccl:OutputDirTypeName {} { return tmpdir; } -proc WOKStep_ccl::HandleInputFile { ID } { +proc WOKStep_ccl:HandleInputFile { ID } { scan $ID "%\[^:\]:%\[^:\]:%\[^:\]" unit type name @@ -31,10 +31,10 @@ proc WOKStep_ccl::HandleInputFile { ID } { } } -proc WOKStep_ccl::Execute { unit args } { +proc WOKStep_ccl:Execute { unit args } { - msgprint -i -c "WOKStep_ccl::Execute" "Processing unit : $unit" - msgprint -i -c "WOKStep_ccl::Execute" + msgprint -i -c "WOKStep_ccl:Execute" "Processing unit : $unit" + msgprint -i -c "WOKStep_ccl:Execute" set unitname [wokinfo -n $unit] set targetid "$unitname:ccldrv:$unitname.ccl" diff --git a/src/WOKStep/WOKStep_frontal.tcl b/src/WOKStep/WOKStep_frontal.tcl index 0464957..06ea6d5 100755 --- a/src/WOKStep/WOKStep_frontal.tcl +++ b/src/WOKStep/WOKStep_frontal.tcl @@ -1,18 +1,18 @@ -proc WOKStep_frontal::AdmFileType {} { +proc WOKStep_frontal:AdmFileType {} { return stadmfile; } -proc WOKStep_frontal::OutputDirTypeName {} { +proc WOKStep_frontal:OutputDirTypeName {} { return sttmpdir; } -proc WOKStep_frontal::HandleInputFile { ID } { +proc WOKStep_frontal:HandleInputFile { ID } { return 1; } -proc WOKStep_frontal::ExecuteOldFrontal {unit args} { +proc WOKStep_frontal:ExecuteOldFrontal {unit args} { global WOK_GLOBALS set pk [wokinfo -n $unit] @@ -58,7 +58,7 @@ proc WOKStep_frontal::ExecuteOldFrontal {unit args} { msgprint -i "Copying binary file Lelisp from ${bin}" if [catch {eval "exec cp $from [pwd]"} res] { - msgprint -e -c "WOKStep_frontal::Execute" $res + msgprint -e -c "WOKStep_frontal:Execute" $res return 1 } @@ -100,11 +100,11 @@ proc WOKStep_frontal::ExecuteOldFrontal {unit args} { set licensefile [woklocate -p CCLFrontal:datafile:[wokparam -e %Ilog_File] $wb] if { $licensefile == "" } { - msgprint -c "WOKStep_frontal::Execute" -e "Unable to locate the Ilog license file" + msgprint -c "WOKStep_frontal:Execute" -e "Unable to locate the Ilog license file" return 1; } - msgprint -c "WOKStep_frontal::Execute" -i "Building $pk" + msgprint -c "WOKStep_frontal:Execute" -i "Building $pk" if [catch {eval "exec /bin/env ILOG_LICENSE_FILE=$licensefile $exec -f tmp.ccl << (end)"} result] { msgprint -e "$result" @@ -113,7 +113,7 @@ proc WOKStep_frontal::ExecuteOldFrontal {unit args} { set resexe [wokinfo -p executable:$pk $unit] set rescore [wokinfo -p corelisp:${pk}.core $unit] - msgprint -i -c "WOKStep_frontal::Execute" "Updating $resexe" + msgprint -i -c "WOKStep_frontal:Execute" "Updating $resexe" wokparam -s "%LeLispFile=$from" wokparam -s "%CoreFile=$rescore" @@ -124,15 +124,15 @@ proc WOKStep_frontal::ExecuteOldFrontal {unit args} { close $fidexe chmod 0755 $resexe } else { - msgprint -e -c "WOKStep_frontal::Execute" "Enable to generate $rescore" - msgprint -e -c "WOKStep_frontal::Execute" $res + msgprint -e -c "WOKStep_frontal:Execute" "Enable to generate $rescore" + msgprint -e -c "WOKStep_frontal:Execute" $res return 1 } - msgprint -i -c "WOKStep_frontal::Execute" "Updating $rescore" + msgprint -i -c "WOKStep_frontal:Execute" "Updating $rescore" if [catch {eval "exec cp $pk.core $rescore"} result] { - msgprint -e -c "WOKStep_frontal::Execute" $result + msgprint -e -c "WOKStep_frontal:Execute" $result } @@ -171,7 +171,7 @@ proc WOKStep_frontal::ExecuteOldFrontal {unit args} { -proc WOKStep_frontal::ExecuteNewFrontal { unit args } { +proc WOKStep_frontal:ExecuteNewFrontal { unit args } { global WOK_GLOBALS set pk [wokinfo -n $unit] @@ -251,7 +251,7 @@ proc WOKStep_frontal::ExecuteNewFrontal { unit args } { set fileoutmsg [wokinfo -p cmpmsgfile:${pk}_Cmp.us $unit] set fileoutoldmsg [wokinfo -p msgfile:${pk}.us $unit] - msgprint -i -c "WOKStep_frontal::Execute" "Updating $resexe" + msgprint -i -c "WOKStep_frontal:Execute" "Updating $resexe" wokparam -s "%CCLFile=$fileout" wokparam -s "%MsgCmpFile=$fileoutmsg" wokparam -s "%MsgFile=$fileoutoldmsg" @@ -265,8 +265,8 @@ proc WOKStep_frontal::ExecuteNewFrontal { unit args } { chmod 0755 $resexe } } else { - msgprint -e -c "WOKStep_frontal::Execute" "Enable to generate $rescore" - msgprint -e -c "WOKStep_frontal::Execute" $res + msgprint -e -c "WOKStep_frontal:Execute" "Enable to generate $rescore" + msgprint -e -c "WOKStep_frontal:Execute" $res return 1 } @@ -289,7 +289,7 @@ proc WOKStep_frontal::ExecuteNewFrontal { unit args } { return 0; } -proc WOKStep_frontal::ExecuteMessages { unit args } { +proc WOKStep_frontal:ExecuteMessages { unit args } { set pk [wokinfo -n $unit] @@ -443,20 +443,20 @@ proc WOKStep_frontal::ExecuteMessages { unit args } { return 0 } -proc WOKStep_frontal::Execute { unit args } { +proc WOKStep_frontal:Execute { unit args } { set pk [wokinfo -n $unit] set resold 0 catch { if {$pk != "KernelFrontal"} { if {[wokparam -e %Station] != "wnt"} { - set resold [WOKStep_frontal::ExecuteOldFrontal $unit $args] + set resold [WOKStep_frontal:ExecuteOldFrontal $unit $args] } } } - set resnew [WOKStep_frontal::ExecuteNewFrontal $unit $args] + set resnew [WOKStep_frontal:ExecuteNewFrontal $unit $args] - set resmes [WOKStep_frontal::ExecuteMessages $unit $args] + set resmes [WOKStep_frontal:ExecuteMessages $unit $args] return [expr [expr $resold && $resnew] || $resmes] }