0022612: Strange warnings on compilation with recent Platform SDKs

Use -showIncludes flag for cl.exe to generate dependencies file
Fixed wok building by wok error

diff --git a/src/WOKBuilderDef/CMPLRS_WNT.edl b/src/WOKBuilderDef/CMPLRS_WNT.edl
index c85cff063a876848296cd5dc88e2172fd4b4280e..9cac9aef983dd5f5725f4b716c87a1a32c4adbb5 100644 (file)
--- a/src/WOKBuilderDef/CMPLRS_WNT.edl
+++ b/src/WOKBuilderDef/CMPLRS_WNT.edl
@@ -66,42 +66,6 @@
     $set status=%cmplrs_status%;
   @end;
 
-  @template CMPLRS_CXX_OptLine (%CMPLRS_CXX_COMPILER,
-                                %CMPLRS_CXX_SysOptions,
-                                %CMPLRS_CXX_Options,
-                                %CMPLRS_ExportBehaviour,
-                                %CMPLRS_CXX_ModeOpt,
-                                %CMPLRS_CXX_DBMSOpt,
-                                %CMPLRS_CXX_INCLUDE,
-                                %CMPLRS_CXX_WOKDirectives,
-                                %IncDirectives,
-                                %DBDirectives,
-                                %Entity) is
-    $Following parameters make up C++ compilation command in this order:
-    $CMPLRS_CXX_COMPILER      = %CMPLRS_CXX_COMPILER
-    $CMPLRS_CXX_SysOptions    = %CMPLRS_CXX_SysOptions
-    $CMPLRS_CXX_Options       = %CMPLRS_CXX_Options
-    $CMPLRS_ExportBehaviour   = %CMPLRS_ExportBehaviour
-    $CMPLRS_CXX_ModeOpt       = %CMPLRS_CXX_ModeOpt
-    $CMPLRS_CXX_DBMSOpt       = %CMPLRS_CXX_DBMSOpt
-    $CMPLRS_CXX_INCLUDE       = %CMPLRS_CXX_INCLUDE
-    $CMPLRS_CXX_WOKDirectives = %CMPLRS_CXX_WOKDirectives
-    $Dynamic include directives are :
-    $%IncDirectives
-  @end;
-
-  @template CMPLRS_CXX_CmdLine (%CMPLRS_CXX_COMPILER, %CMPLRS_CXX_SysOptions, %CMPLRS_CXX_Options, %CMPLRS_CXX_ModeOpt,
-                                %CMPLRS_CXX_DBMSOpt, %IncDirectives, %CMPLRS_CXX_INCLUDE, %PDBName, %Source,
-                                %BaseName, %OutputDir, %CMPLRS_ExportBehaviour) is
-    $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_ExportBehaviour\^
-    $  %IncDirectives %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt \^
-    $ -Fd%PDBName -c -Tp %Source -Fo%OutputDir%BaseName.obj;
-    $set cmplrs_status=%status%;
-    $@acpp.exe -M -m -+ %CMPLRS_CXX_Options -D__cplusplus -D_DLL -D_MT %CMPLRS_ExportBehaviour  %IncDirectives %CMPLRS_CXX_INCLUDE\^
-    $ %Source -o %OutputDir%BaseName.m;
-    $set status=%cmplrs_status%;
-  @end;
-
   @template CMPLRS_C_OptLine (%CMPLRS_C_COMPILER,
                               %CMPLRS_C_SysOptions,
                               %CMPLRS_C_Options,
@@ -123,9 +87,17 @@
     $%IncDirectives
   @end;
 
-  @template CMPLRS_C_CmdLine (%CMPLRS_C_COMPILER, %CMPLRS_C_SysOptions, %CMPLRS_C_Options, %CMPLRS_C_ModeOpt, %CMPLRS_CXX_DBMSOpt,
-                              %IncDirectives, %PDBName, %Source,
-                              %BaseName, %OutputDir, %CMPLRS_ExportBehaviour) is
+  @template CMPLRS_C_CmdLine (%CMPLRS_C_COMPILER,
+                              %CMPLRS_C_SysOptions,
+                              %CMPLRS_C_Options,
+                              %CMPLRS_C_ModeOpt,
+                              %CMPLRS_CXX_DBMSOpt,
+                              %IncDirectives,
+                              %PDBName,
+                              %Source,
+                              %BaseName,
+                              %OutputDir,
+                              %CMPLRS_ExportBehaviour) is
     $%CMPLRS_C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options %CMPLRS_ExportBehaviour\^
     $  %IncDirectives %CMPLRS_CXX_DBMSOpt %CMPLRS_C_ModeOpt \^
     $ -Fd%PDBName -c -Tc %Source -Fo%OutputDir%BaseName.obj;
@@ -135,4 +107,49 @@
     $set status=%cmplrs_status%;
   @end;
 
+  @template CMPLRS_CXX_OptLine (%CMPLRS_CXX_COMPILER,
+                                %CMPLRS_CXX_SysOptions,
+                                %CMPLRS_CXX_Options,
+                                %CMPLRS_ExportBehaviour,
+                                %CMPLRS_CXX_ModeOpt,
+                                %CMPLRS_CXX_DBMSOpt,
+                                %CMPLRS_CXX_INCLUDE,
+                                %CMPLRS_CXX_WOKDirectives,
+                                %IncDirectives,
+                                %DBDirectives,
+                                %Entity) is
+    $Following parameters make up C++ compilation command in this order:
+    $CMPLRS_CXX_COMPILER      = %CMPLRS_CXX_COMPILER
+    $CMPLRS_CXX_SysOptions    = %CMPLRS_CXX_SysOptions
+    $CMPLRS_CXX_Options       = %CMPLRS_CXX_Options
+    $CMPLRS_ExportBehaviour   = %CMPLRS_ExportBehaviour
+    $CMPLRS_CXX_ModeOpt       = %CMPLRS_CXX_ModeOpt
+    $CMPLRS_CXX_DBMSOpt       = %CMPLRS_CXX_DBMSOpt
+    $CMPLRS_CXX_INCLUDE       = %CMPLRS_CXX_INCLUDE
+    $CMPLRS_CXX_WOKDirectives = %CMPLRS_CXX_WOKDirectives
+    $Dynamic include directives are :
+    $%IncDirectives
+  @end;
+
+  @template CMPLRS_CXX_CmdLine (%CMPLRS_CXX_COMPILER,
+                                %CMPLRS_CXX_SysOptions,
+                                %CMPLRS_CXX_Options,
+                                %CMPLRS_CXX_ModeOpt,
+                                %CMPLRS_CXX_DBMSOpt,
+                                %IncDirectives,
+                                %CMPLRS_CXX_INCLUDE,
+                                %PDBName,
+                                %Source,
+                                %BaseName,
+                                %OutputDir,
+                                %CMPLRS_ExportBehaviour) is
+    $call %CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_ExportBehaviour\^
+    $  %IncDirectives %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt \^
+    $ -Fd%PDBName -showIncludes -c -Tp %Source -Fo%OutputDir%BaseName.obj > %OutputDir%BaseName.d 2>&1;
+    $set cmplrs_status=%status%;
+    $call grep -v '^Note: including file: ' "%OutputDir%BaseName.d";
+    $call sed -n '/^Note: including file:  *\(.*\)/ { s//\1/; s/\\/\//g; p; }' < %OutputDir%BaseName.d > %OutputDir%BaseName.m;
+    $set status=%cmplrs_status%;
+  @end;
+
 @endif;

diff --git a/src/WOKTclLib/FILES b/src/WOKTclLib/FILES
index 48bc0618a456a0d3d1da523bc1ebf0a40f6e1146..338e13c533c71d1080aafe619232a6f2f890b254 100755 (executable)
--- a/src/WOKTclLib/FILES
+++ b/src/WOKTclLib/FILES
@@ -142,8 +142,6 @@ srcinc:::wokcvs.tcl
 srcinc:::ud2cvs_unix
 srcinc:::template.min
 srcinc:::template.minx
-srcinc:::template.mam
-srcinc:::template.mamx
 srcinc:::osutils.tcl
 srcinc:::config.h
 srcinc:::opencascade.gif