OCC13817, OCC13143, OCC13648 WOK improvements

diff --git a/src/WOKBuilder/WOKBuilder.cdl b/src/WOKBuilder/WOKBuilder.cdl
index a9290c27c38ead23b5adf248eb6b52ad6ae9ca4f..ecac93e9ce8f3cb9594b8662f1df04a9ff746846 100755 (executable)
--- a/src/WOKBuilder/WOKBuilder.cdl
+++ b/src/WOKBuilder/WOKBuilder.cdl
@@ -87,6 +87,8 @@ is
            class ImportLibrary;  --
            class StaticLibrary;  --
            class ExportLibrary;  --
+           --class ManifestEXE;    --
+           class ManifestLibrary;--
                                  --
              ----------------------
 

diff --git a/src/WOKBuilder/WOKBuilder_DLLinker.cxx b/src/WOKBuilder/WOKBuilder_DLLinker.cxx
index c2cba37f62914834f837a11042b9aa19df329e40..76330f35215c9b423589c8bbf48baf40c72e4bdd 100755 (executable)
--- a/src/WOKBuilder/WOKBuilder_DLLinker.cxx
+++ b/src/WOKBuilder/WOKBuilder_DLLinker.cxx
@@ -3,6 +3,7 @@
 #include <WOKBuilder_ImportLibrary.hxx>
 #include <WOKBuilder_SharedLibrary.hxx>
 #include <WOKBuilder_ExportLibrary.hxx>
+#include <WOKBuilder_ManifestLibrary.hxx>
 #include <WOKBuilder_HSequenceOfEntity.hxx>
 
 #include <WOKTools_Messages.hxx>
@@ -43,7 +44,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_DLLinker::EvalCFExt()
 
 Handle(TCollection_HAsciiString) WOKBuilder_DLLinker::EvalFooter()
 {
-  Handle(WOKBuilder_Entity)        outEnt[4];
+  Handle(WOKBuilder_Entity)        outEnt[5];
   Handle(TCollection_HAsciiString) tmp;
   Handle(TCollection_HAsciiString) retVal = EvalToolParameter("LinkerOutput");
  
@@ -66,7 +67,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_DLLinker::EvalFooter()
   tmp = EvalToolTemplate ( "LinkerPDB" );
   retVal -> AssignCat ( tmp );
   outEnt[3] = new WOKBuilder_SharedLibrary(new WOKUtils_Path(tmp));
-
+  outEnt[4] = new WOKBuilder_ManifestLibrary(new WOKUtils_Path(EvalToolTemplate("DLLMAN")));
   SetProduction(new WOKBuilder_HSequenceOfEntity());
 
   Produces()->Append(outEnt[0]);
@@ -74,6 +75,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_DLLinker::EvalFooter()
   Produces()->Append(outEnt[2]);
 
   Produces()->Append(outEnt[3]);
+  Produces()->Append(outEnt[4]);
   return retVal;
 }
 

diff --git a/src/WOKBuilder/WOKBuilder_EXELinker.cxx b/src/WOKBuilder/WOKBuilder_EXELinker.cxx
index 5f4aa6faf7ae9f64a2de99cfb3b01aa51ec6779c..774b989ee12946a9bc221d716767332a6a2b79fc 100755 (executable)
--- a/src/WOKBuilder/WOKBuilder_EXELinker.cxx
+++ b/src/WOKBuilder/WOKBuilder_EXELinker.cxx
@@ -5,6 +5,7 @@
 
 #include <WOKBuilder_Executable.hxx>
 #include <WOKBuilder_SharedLibrary.hxx>
+#include <WOKBuilder_ManifestLibrary.hxx>
 #include <WOKBuilder_HSequenceOfEntity.hxx>
 
 #include <WOKTools_Messages.hxx>
@@ -45,7 +46,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_EXELinker::EvalCFExt()
 
 Handle(TCollection_HAsciiString) WOKBuilder_EXELinker::EvalFooter()
 {
- Handle(WOKBuilder_Entity)        outEnt[2];
+ Handle(WOKBuilder_Entity)        outEnt[3];
  Handle(TCollection_HAsciiString) tmp;
  Handle(TCollection_HAsciiString) retVal = EvalToolParameter("LinkerOutput");
  //Standard_Boolean                 fDebug;
@@ -65,12 +66,14 @@ Handle(TCollection_HAsciiString) WOKBuilder_EXELinker::EvalFooter()
  retVal->AssignCat(tmp);
  outEnt[1] = new WOKBuilder_SharedLibrary(new WOKUtils_Path(tmp));
  //  }
- 
+ outEnt[2] = new WOKBuilder_ManifestLibrary(new WOKUtils_Path(EvalToolTemplate("EXEMAN")));
  SetProduction(new WOKBuilder_HSequenceOfEntity);
  Produces()->Append(outEnt[0]);
  
  //if(fDebug) 
  Produces()->Append(outEnt[1]);
+ Produces()->Append(outEnt[2]);
+
  return retVal;
 }