From: cas <cas@opencascade.com>
Date: Mon, 3 Apr 2000 11:19:21 +0000 (+0000)
Subject: No comments
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=389eeceb9b2b868f6ea192d913c5aa53a47ed969;p=occt-wok.git

No comments
---

diff --git a/src/WOKStep/WOKStep_LinkList.cxx b/src/WOKStep/WOKStep_LinkList.cxx
index d3e9613..fe40261 100755
--- a/src/WOKStep/WOKStep_LinkList.cxx
+++ b/src/WOKStep/WOKStep_LinkList.cxx
@@ -41,7 +41,9 @@
 
 #include <WOKStep_LinkList.ixx>
 
-
+//---> EUG4JR
+Standard_Boolean g_fForceLib;
+//<--- EUG4JR
 
 //=======================================================================
 //function : WOKStep_LinkList
@@ -194,13 +196,14 @@ Handle(WOKMake_OutputFile) WOKStep_LinkList::GetUnitLibrary(const Handle(WOKerne
 	  Standard_Boolean mustExist = aunit->SearchInFileList(Locator(),libname);
 	  if (mustExist)
 	    {
-	      ErrorMsg << "WOKStep_LinkList::GetUnitLibrary" 
-		       << "No library (" << libname << ") found for unit " << aunit->Name() << endm;	      
-	      SetFailed();
+//	      ErrorMsg << "WOKStep_LinkList::GetUnitLibrary" 
+//		       << "No library (" << libname << ") found for unit " << aunit->Name() << endm;	      
+//	      SetFailed();
 	    }
-	  else
-	    WarningMsg << "WOKStep_LinkList::GetUnitLibrary" 
-		       << "No library (" << libname << ") in unit " << aunit->Name() << endm;
+	  else {
+//	    WarningMsg << "WOKStep_LinkList::GetUnitLibrary" 
+//		       << "No library (" << libname << ") in unit " << aunit->Name() << endm;
+	  }
 	}
       else
 	{
@@ -350,9 +353,15 @@ void WOKStep_LinkList::AddWorkbenchUnitContribution(const Handle(WOKMake_InputFi
 		  InfoMsg << "WOKStep_LinkList::GetUnitContribution" 
 		    << "Processing step " << step->UniqueName() << endm;
 
+//---> EUG4JR
+          if (   !strcmp (  DynamicType () -> Name (), "WOKStep_TransitiveLinkList"  )   )
 
+           g_fForceLib = Standard_True;
+//<--- EUG4JR
 		  Handle(WOKMake_HSequenceOfOutputFile) outfiles = step->OutputFileList();
-		  
+//---> EUG4JR
+          if ( g_fForceLib ) g_fForceLib = Standard_False;
+//<--- EUG4JR		  
 		  if(outfiles.IsNull())
 		    {
 		      ErrorMsg << "WOKStep_LinkList::GetUnitContribution" 
diff --git a/src/WOKStep/WOKStep_TKReplace.cxx b/src/WOKStep/WOKStep_TKReplace.cxx
index b983d41..5d27a4b 100755
--- a/src/WOKStep/WOKStep_TKReplace.cxx
+++ b/src/WOKStep/WOKStep_TKReplace.cxx
@@ -138,10 +138,13 @@ void WOKStep_TKReplace::LoadTKDefs()
   Handle(TCollection_HAsciiString)        aunitname;
   Handle(TCollection_HAsciiString)        afullname, abasename;
   Standard_Integer                        i,j;
-  
+#if 0  
   Handle(WOKernel_File) toolkits = Locator()->Locate(Unit()->Name(),
 						     new TCollection_HAsciiString("source"), 
 						     new TCollection_HAsciiString("TOOLKITS"));
+#else
+  Handle(WOKernel_File) toolkits;
+#endif
 
   if(toolkits.IsNull())
     {
@@ -285,6 +288,7 @@ void WOKStep_TKReplace::LoadTKDefs()
     }
 
 #ifdef WNT
+ if (  !mymatrix.IsNull ()  ) {
 
   // if faut enlever le tk qui contient eventuellement l'ud en cours de construction
   if(!WOKernel_IsToolkit(Unit()))
@@ -332,6 +336,7 @@ void WOKStep_TKReplace::LoadTKDefs()
 	    }
 	}
     }
+ }  // end if
 #endif
 }
 
@@ -371,8 +376,10 @@ _TEST_BREAK();
 		{
 		  WarningMsg << "WOKStep_TKReplace::GetTKForUnit"
 			     << "More than one toolkit contains " << aunit << " using " << result << " ignoring " << mytks(i) << endm;
+#if 0
 		  WarningMsg << "WOKStep_TKReplace::GetTKForUnit"
 			     << "You can specify the toolkit used using a TOOLKITS file" << endm;
+#endif
 		}
 	      else
 		{